From 6246c5f4f4d879dcd5ff17e861ffdea0951fa76d Mon Sep 17 00:00:00 2001
From: David Waltermire <david.waltermire@nist.gov>
Date: Mon, 7 Jun 2021 23:04:12 -0400
Subject: [PATCH] Posting up-to-date schema and converters.

---
 ..._assessment-plan_xml-to-json-converter.xsl |  751 +-
 ...sessment-results_xml-to-json-converter.xsl | 1389 ++-
 .../oscal_catalog_xml-to-json-converter.xsl   |  615 +-
 .../oscal_complete_xml-to-json-converter.xsl  | 4653 ++++++++--
 .../oscal_component_xml-to-json-converter.xsl |  409 +-
 .../oscal_poam_xml-to-json-converter.xsl      |  748 +-
 .../oscal_profile_xml-to-json-converter.xsl   |  613 +-
 .../oscal_ssp_xml-to-json-converter.xsl       |  789 +-
 json/schema/oscal_assessment-plan_schema.json | 1766 ++--
 .../oscal_assessment-results_schema.json      | 1918 ++--
 json/schema/oscal_complete_schema.json        | 3264 +++----
 json/schema/oscal_poam_schema.json            | 1804 ++--
 ..._assessment-plan_json-to-xml-converter.xsl | 1154 +--
 ...sessment-results_json-to-xml-converter.xsl | 2292 ++---
 .../oscal_catalog_json-to-xml-converter.xsl   |  900 +-
 .../oscal_complete_json-to-xml-converter.xsl  | 7908 +++++++++--------
 .../oscal_component_json-to-xml-converter.xsl |  658 +-
 .../oscal_poam_json-to-xml-converter.xsl      | 1320 +--
 .../oscal_profile_json-to-xml-converter.xsl   |  880 +-
 .../oscal_ssp_json-to-xml-converter.xsl       | 1305 +--
 xml/schema/oscal_assessment-plan_schema.xsd   |   59 +-
 .../oscal_assessment-results_schema.xsd       |   59 +-
 xml/schema/oscal_complete_schema.xsd          |   59 +-
 xml/schema/oscal_poam_schema.xsd              |   59 +-
 24 files changed, 21911 insertions(+), 13461 deletions(-)

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 174894b641..b53963a3ed 100644
--- a/json/convert/oscal_assessment-plan_xml-to-json-converter.xsl
+++ b/json/convert/oscal_assessment-plan_xml-to-json-converter.xsl
@@ -87,7 +87,7 @@
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan"
                 name="assessment-plan"
                 key="assessment-plan"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-plan_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-plan_metaschema.xml"
                 _key-name="oscal-ap:assessment-plan"
                 _using-root-name="assessment-plan"
                 gi="assessment-plan">
@@ -128,7 +128,7 @@
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan/metadata"
                 name="metadata"
                 key="metadata"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:metadata"
                 _step="metadata"
                 _key="metadata"
@@ -204,7 +204,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/revision/prop"
                 _metaschema-json-id="/assembly/oscal-metadata/revision/props"
                 name="property"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:property"
                 _step="prop"
                 _key="props"
@@ -227,7 +227,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/revision/link"
                 _metaschema-json-id="/assembly/oscal-metadata/revision/links"
                 name="link"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:link"
                 _step="link"
                 _key="links"
@@ -248,7 +248,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/role"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/roles"
                 name="role"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:role"
                 _step="role"
                 _key="roles"
@@ -284,7 +284,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/location"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/locations"
                 name="location"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:location"
                 _step="location"
                 _key="locations"
@@ -340,7 +340,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/party"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/parties"
                 name="party"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:party"
                 _step="party"
                 _key="parties"
@@ -418,7 +418,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/responsible-party"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/responsible-parties"
                 name="responsible-party"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:responsible-party"
                 _step="responsible-party"
                 _key="responsible-parties"
@@ -459,7 +459,7 @@
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan/import-ssp"
                 name="import-ssp"
                 key="import-ssp"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:import-ssp"
                 _step="import-ssp"
                 _key="import-ssp"
@@ -481,7 +481,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/local-definitions/component"
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan/local-definitions/components"
                 name="system-component"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:system-component"
                 _step="component"
                 _key="components"
@@ -533,7 +533,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/responsible-role"
                 _metaschema-json-id="/assembly/oscal-implementation-common/system-component/responsible-roles"
                 name="responsible-role"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:responsible-role"
                 _step="responsible-role"
                 _key="responsible-roles"
@@ -573,7 +573,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/protocol"
                 _metaschema-json-id="/assembly/oscal-implementation-common/system-component/protocols"
                 name="protocol"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:protocol"
                 _step="protocol"
                 _key="protocols"
@@ -601,7 +601,7 @@
                 _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/port-range"
                 _metaschema-json-id="/assembly/oscal-implementation-common/protocol/port-ranges"
                 name="port-range"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:port-range"
                 _step="port-range"
                 _key="port-ranges"
@@ -621,7 +621,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/local-definitions/inventory-item"
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan/local-definitions/inventory-items"
                 name="inventory-item"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:inventory-item"
                 _step="inventory-item"
                 _key="inventory-items"
@@ -669,7 +669,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/local-definitions/user"
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan/local-definitions/users"
                 name="system-user"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:system-user"
                 _step="user"
                 _key="users"
@@ -719,7 +719,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/authorized-privilege"
                 _metaschema-json-id="/assembly/oscal-implementation-common/system-user/authorized-privileges"
                 name="authorized-privilege"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:authorized-privilege"
                 _step="authorized-privilege"
                 _key="authorized-privileges"
@@ -745,7 +745,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/local-definitions/objectives-and-methods"
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan/local-definitions/objectives-and-methods"
                 name="local-objective"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:local-objective"
                 _step="objectives-and-methods"
                 _key="objectives-and-methods"
@@ -786,7 +786,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/local-objective/part"
                 _metaschema-json-id="/assembly/oscal-assessment-common/local-objective/parts"
                 name="part"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
                 _key-name="oscal-catalog-common:part"
                 _step="part"
                 _key="parts"
@@ -807,7 +807,29 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:apply-templates select=""/>
+         <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                             group-by="true()">
+            <field in-json="SCALAR"
+                   _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+                   _key="prose"
+                   _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
+                   _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 in-json="string"
+                      as-type="markup-multiline"
+                      _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                      _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE">
+                  <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+               </value>
+            </field>
+         </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()">
@@ -830,7 +852,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/terms-and-conditions/part"
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan/terms-and-conditions/parts"
                 name="assessment-part"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:assessment-part"
                 _step="part"
                 _key="parts"
@@ -851,7 +873,29 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:apply-templates select=""/>
+         <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                             group-by="true()">
+            <field in-json="SCALAR"
+                   _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+                   _key="prose"
+                   _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/p ul ol pre table h1 h2 h3 h4 h5 h6"
+                   _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 in-json="string"
+                      as-type="markup-multiline"
+                      _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                      _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE">
+                  <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+               </value>
+            </field>
+         </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()">
@@ -874,7 +918,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/local-definitions/activity"
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan/local-definitions/activities"
                 name="activity"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:activity"
                 _step="activity"
                 _key="activities"
@@ -925,7 +969,7 @@
                 _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps/reviewed-controls"
                 name="reviewed-controls"
                 key="reviewed-controls"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:reviewed-controls"
                 _step="reviewed-controls"
                 _key="reviewed-controls"
@@ -976,7 +1020,7 @@
                 _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/include-objective"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/include-objectives"
                 name="select-objective-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-objective-by-id"
                 _step="include-objective"
                 _key="include-objectives"
@@ -995,7 +1039,7 @@
                 _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/exclude-objective"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/exclude-objectives"
                 name="select-objective-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-objective-by-id"
                 _step="exclude-objective"
                 _key="exclude-objectives"
@@ -1014,7 +1058,7 @@
                 _metaschema-json-id="/assembly/oscal-assessment-common/activity/related-controls"
                 name="reviewed-controls"
                 key="related-controls"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:reviewed-controls"
                 _step="related-controls"
                 _key="related-controls"
@@ -1064,7 +1108,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/assessment-subject"
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan/assessment-subjects"
                 name="assessment-subject"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:assessment-subject"
                 _step="assessment-subject"
                 _key="assessment-subjects"
@@ -1113,7 +1157,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-subjects"
                 name="select-subject-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-subject-by-id"
                 _step="include-subject"
                 _key="include-subjects"
@@ -1147,7 +1191,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/exclude-subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/exclude-subjects"
                 name="select-subject-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-subject-by-id"
                 _step="exclude-subject"
                 _key="exclude-subjects"
@@ -1182,7 +1226,7 @@
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan/assessment-assets"
                 name="assessment-assets"
                 key="assessment-assets"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:assessment-assets"
                 _step="assessment-assets"
                 _key="assessment-assets"
@@ -1216,7 +1260,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/task"
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan/tasks"
                 name="task"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:task"
                 _step="task"
                 _key="tasks"
@@ -1288,7 +1332,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/task/associated-activity/subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/task/associated-activities/subjects"
                 name="assessment-subject"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:assessment-subject"
                 _step="subject"
                 _key="subjects"
@@ -1338,7 +1382,7 @@
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan/back-matter"
                 name="back-matter"
                 key="back-matter"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:back-matter"
                 _step="back-matter"
                 _key="back-matter"
@@ -1369,7 +1413,7 @@
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:remarks"
              _step="remarks"
              _key="remarks"
@@ -1382,6 +1426,12 @@
          <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"
@@ -1392,7 +1442,7 @@
              collapsible="no"
              as-type="uuid"
              name="location-uuid"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:location-uuid"
              _step="location-uuid"
              _key="location-uuids"
@@ -1401,7 +1451,11 @@
              _in-xml-name="location-uuid"
              _in-json-name="location-uuids"
              gi="location-uuid"
-             in-json="SCALAR"/>
+             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">
@@ -1411,7 +1465,7 @@
              collapsible="no"
              as-type="uuid"
              name="party-uuid"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:party-uuid"
              _step="party-uuid"
              _key="party-uuids"
@@ -1420,7 +1474,11 @@
              _in-xml-name="party-uuid"
              _in-json-name="party-uuids"
              gi="party-uuid"
-             in-json="SCALAR"/>
+             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">
@@ -1430,7 +1488,7 @@
              collapsible="no"
              as-type="token"
              name="role-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:role-id"
              _step="role-id"
              _key="role-ids"
@@ -1439,7 +1497,11 @@
              _in-xml-name="role-id"
              _in-json-name="role-ids"
              gi="role-id"
-             in-json="SCALAR"/>
+             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">
@@ -1449,7 +1511,7 @@
              collapsible="no"
              as-type="string"
              name="function-performed"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
              _key-name="oscal-implementation-common:function-performed"
              _step="function-performed"
              _key="functions-performed"
@@ -1458,7 +1520,11 @@
              _in-xml-name="function-performed"
              _in-json-name="functions-performed"
              gi="function-performed"
-             in-json="SCALAR"/>
+             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">
@@ -1468,7 +1534,7 @@
              collapsible="no"
              as-type="string"
              name="hash"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:hash"
              _step="hash"
              _key="hashes"
@@ -1627,7 +1693,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/link/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -1699,7 +1765,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/address/type"
             name="location-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:location-type"
             _step="type"
             _key="type"
@@ -1840,7 +1906,7 @@
             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/type"
             name="system-component-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
             _key-name="oscal-implementation-common:system-component-type"
             _step="type"
             _key="type"
@@ -2032,7 +2098,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/local-objective/control-id"
             name="control-id"
             key="control-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
             _key-name="oscal-catalog-common:control-id"
             _step="control-id"
             _key="control-id"
@@ -2155,7 +2221,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/control-id"
             name="control-id"
             key="control-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
             _key-name="oscal-catalog-common:control-id"
             _step="control-id"
             _key="control-id"
@@ -2175,7 +2241,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/select-objective-by-id/objective-id"
             name="objective-id"
             key="objective-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
             _key-name="oscal-assessment-common:objective-id"
             _step="objective-id"
             _key="objective-id"
@@ -2280,7 +2346,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/select-subject-by-id/subject-uuid"
             name="subject-uuid"
             key="subject-uuid"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
             _key-name="oscal-assessment-common:subject-uuid"
             _step="subject-uuid"
             _key="subject-uuid"
@@ -2300,7 +2366,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/select-subject-by-id/type"
             name="subject-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
             _key-name="oscal-assessment-common:subject-type"
             _step="type"
             _key="type"
@@ -2552,7 +2618,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -2607,7 +2673,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -2639,6 +2705,9 @@
          <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/published"
@@ -2651,7 +2720,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -2664,6 +2733,9 @@
          <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="assessment-plan/metadata/last-modified"
@@ -2676,7 +2748,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -2689,6 +2761,9 @@
          <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="assessment-plan/metadata/version"
@@ -2701,7 +2776,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -2714,6 +2789,9 @@
          <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/oscal-version"
@@ -2726,7 +2804,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -2739,6 +2817,9 @@
          <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"
@@ -2748,7 +2829,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/revisions/revision"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/revisions"
                 name="revision"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:revision"
                 _step="revisions/revision"
                 _key="revisions"
@@ -2788,7 +2869,7 @@
              group-json="ARRAY"
              name="revision"
              key="revisions"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:revision"
              _key-ref="oscal-metadata:revision">
          <xsl:if test="$with-key">
@@ -2817,6 +2898,9 @@
          <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/revisions/revision/published"
@@ -2829,7 +2913,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -2842,6 +2926,9 @@
          <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="assessment-plan/metadata/revisions/revision/last-modified"
@@ -2854,7 +2941,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -2867,6 +2954,9 @@
          <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="assessment-plan/metadata/revisions/revision/version"
@@ -2879,7 +2969,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -2892,6 +2982,9 @@
          <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"
@@ -2904,7 +2997,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -2917,6 +3010,9 @@
          <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"
@@ -2939,6 +3035,9 @@
          <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/document-id"
@@ -2950,7 +3049,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -2985,6 +3084,9 @@
          <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/role/title"
@@ -3007,6 +3109,9 @@
          <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/role/short-name"
@@ -3029,6 +3134,9 @@
          <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/metadata/role/description"
@@ -3052,6 +3160,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/role/link/text"
@@ -3074,6 +3188,9 @@
          <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/title"
@@ -3096,6 +3213,9 @@
          <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/location/address"
@@ -3106,7 +3226,7 @@
                 _metaschema-json-id="/assembly/oscal-metadata/location/address"
                 name="address"
                 key="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="address"
@@ -3141,7 +3261,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -3150,7 +3270,11 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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"
@@ -3172,6 +3296,9 @@
          <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="assessment-plan/metadata/location/address/state"
@@ -3194,6 +3321,9 @@
          <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="assessment-plan/metadata/location/address/postal-code"
@@ -3216,6 +3346,9 @@
          <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="assessment-plan/metadata/location/address/country"
@@ -3238,6 +3371,9 @@
          <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="assessment-plan/metadata/location/email-address"
@@ -3249,7 +3385,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -3258,7 +3394,11 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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"
@@ -3269,7 +3409,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -3299,7 +3439,11 @@
              _in-xml-name="url"
              _in-json-name="urls"
              gi="url"
-             in-json="SCALAR"/>
+             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"
@@ -3321,6 +3465,9 @@
          <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/party/name"
@@ -3343,6 +3490,9 @@
          <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="assessment-plan/metadata/party/short-name"
@@ -3365,6 +3515,9 @@
          <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/metadata/party/external-id"
@@ -3408,6 +3561,9 @@
          <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/party/email-address"
@@ -3419,7 +3575,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -3428,7 +3584,11 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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"
@@ -3439,7 +3599,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -3461,7 +3621,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/party/address"
                 _metaschema-json-id="/assembly/oscal-metadata/party/addresses"
                 name="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="addresses"
@@ -3493,7 +3653,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -3502,7 +3662,11 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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"
@@ -3524,6 +3688,9 @@
          <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="assessment-plan/metadata/party/address/state"
@@ -3546,6 +3713,9 @@
          <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="assessment-plan/metadata/party/address/postal-code"
@@ -3568,6 +3738,9 @@
          <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="assessment-plan/metadata/party/address/country"
@@ -3590,6 +3763,9 @@
          <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="assessment-plan/metadata/party/member-of-organization"
@@ -3607,7 +3783,11 @@
              _in-xml-name="member-of-organization"
              _in-json-name="member-of-organizations"
              gi="member-of-organization"
-             in-json="SCALAR"/>
+             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"
@@ -3629,6 +3809,9 @@
          <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/local-definitions"
@@ -3706,6 +3889,9 @@
          <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/component/description"
@@ -3729,6 +3915,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/purpose"
@@ -3751,6 +3943,9 @@
          <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/local-definitions/component/link/text"
@@ -3773,6 +3968,9 @@
          <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/local-definitions/component/status"
@@ -3816,6 +4014,9 @@
          <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/local-definitions/component/protocol/title"
@@ -3838,6 +4039,9 @@
          <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/inventory-item/description"
@@ -3861,6 +4065,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/link/text"
@@ -3883,6 +4093,9 @@
          <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/local-definitions/inventory-item/responsible-party/link/text"
@@ -3905,6 +4118,9 @@
          <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/local-definitions/inventory-item/implemented-component"
@@ -3965,6 +4181,9 @@
          <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/local-definitions/inventory-item/implemented-component/responsible-party/link/text"
@@ -3987,6 +4206,9 @@
          <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/local-definitions/user/title"
@@ -4009,6 +4231,9 @@
          <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/short-name"
@@ -4031,6 +4256,9 @@
          <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"
@@ -4054,6 +4282,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/user/link/text"
@@ -4076,6 +4310,9 @@
          <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/local-definitions/user/authorized-privilege/title"
@@ -4098,6 +4335,9 @@
          <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"
@@ -4121,6 +4361,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/objectives-and-methods/description"
@@ -4144,6 +4390,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/objectives-and-methods/link/text"
@@ -4166,6 +4418,9 @@
          <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/local-definitions/objectives-and-methods//part/title"
@@ -4188,28 +4443,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/objectives-and-methods//part"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _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"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl: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/objectives-and-methods//part/link/text"
@@ -4232,6 +4468,9 @@
          <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/local-definitions/activity/title"
@@ -4254,6 +4493,9 @@
          <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/activity/description"
@@ -4277,6 +4519,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/link/text"
@@ -4299,6 +4547,9 @@
          <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/local-definitions/activity/step"
@@ -4362,6 +4613,9 @@
          <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/activity/step/description"
@@ -4385,6 +4639,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -4407,6 +4667,9 @@
          <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/local-definitions/activity/step/reviewed-controls/description"
@@ -4430,6 +4693,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -4452,6 +4721,9 @@
          <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/local-definitions/activity/step/reviewed-controls/control-selection"
@@ -4521,6 +4793,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/control-selection/link/text"
@@ -4543,6 +4821,9 @@
          <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/local-definitions/activity/step/reviewed-controls/control-selection/include-all"
@@ -4572,7 +4853,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="include-control"
                 _key="include-controls"
@@ -4606,7 +4887,11 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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"
@@ -4615,7 +4900,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/exclude-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/exclude-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="exclude-control"
                 _key="exclude-controls"
@@ -4649,7 +4934,11 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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"
@@ -4718,6 +5007,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/control-objective-selection/link/text"
@@ -4740,6 +5035,9 @@
          <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/local-definitions/activity/step/reviewed-controls/control-objective-selection/include-all"
@@ -4782,6 +5080,9 @@
          <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/local-definitions/activity/related-controls/description"
@@ -4805,6 +5106,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/related-controls/link/text"
@@ -4827,6 +5134,9 @@
          <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/local-definitions/activity/related-controls/control-selection"
@@ -4896,6 +5206,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/related-controls/control-selection/link/text"
@@ -4918,6 +5234,9 @@
          <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/local-definitions/activity/related-controls/control-selection/include-all"
@@ -4947,7 +5266,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="include-control"
                 _key="include-controls"
@@ -4981,7 +5300,11 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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"
@@ -4990,7 +5313,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/exclude-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/exclude-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="exclude-control"
                 _key="exclude-controls"
@@ -5024,7 +5347,11 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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"
@@ -5093,6 +5420,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/related-controls/control-objective-selection/link/text"
@@ -5115,6 +5448,9 @@
          <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/local-definitions/activity/related-controls/control-objective-selection/include-all"
@@ -5157,6 +5493,9 @@
          <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/terms-and-conditions"
@@ -5205,28 +5544,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-plan/terms-and-conditions//part"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _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"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl: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"
@@ -5249,6 +5569,9 @@
          <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/description"
@@ -5272,6 +5595,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/reviewed-controls/link/text"
@@ -5294,6 +5623,9 @@
          <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-selection"
@@ -5363,6 +5695,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/reviewed-controls/control-selection/link/text"
@@ -5385,6 +5723,9 @@
          <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-selection/include-all"
@@ -5414,7 +5755,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="include-control"
                 _key="include-controls"
@@ -5448,7 +5789,11 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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"
@@ -5457,7 +5802,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/exclude-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/exclude-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="exclude-control"
                 _key="exclude-controls"
@@ -5491,7 +5836,11 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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"
@@ -5560,6 +5909,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/reviewed-controls/control-objective-selection/link/text"
@@ -5582,6 +5937,9 @@
          <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/include-all"
@@ -5625,6 +5983,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -5647,6 +6011,9 @@
          <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/include-all"
@@ -5689,6 +6056,9 @@
          <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"
@@ -5711,6 +6081,9 @@
          <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"
@@ -5733,6 +6106,9 @@
          <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"
@@ -5756,6 +6132,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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-assets/component/purpose"
@@ -5778,6 +6160,9 @@
          <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"
@@ -5800,6 +6185,9 @@
          <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/status"
@@ -5843,6 +6231,9 @@
          <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"
@@ -5865,6 +6256,9 @@
          <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"
@@ -5926,6 +6320,9 @@
          <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"
@@ -5948,6 +6345,9 @@
          <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"
@@ -6008,6 +6408,9 @@
          <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"
@@ -6030,6 +6433,9 @@
          <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"
@@ -6052,6 +6458,9 @@
          <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"
@@ -6075,6 +6484,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/link/text"
@@ -6097,6 +6512,9 @@
          <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/timing"
@@ -6268,6 +6686,9 @@
          <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"
@@ -6290,6 +6711,9 @@
          <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"
@@ -6313,6 +6737,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/associated-activity/subject/link/text"
@@ -6335,6 +6765,9 @@
          <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/include-all"
@@ -6377,6 +6810,9 @@
          <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/exclude-subject/link/text"
@@ -6399,6 +6835,9 @@
          <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/subject/description"
@@ -6422,6 +6861,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -6444,6 +6889,9 @@
          <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/subject/include-all"
@@ -6486,6 +6934,9 @@
          <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/subject/exclude-subject/link/text"
@@ -6508,6 +6959,9 @@
          <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/responsible-role/link/text"
@@ -6530,6 +6984,9 @@
          <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"
@@ -6594,6 +7051,9 @@
          <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"
@@ -6617,6 +7077,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/back-matter/resource/document-id"
@@ -6628,7 +7094,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -6697,6 +7163,9 @@
          <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/link/text"
@@ -6719,6 +7188,9 @@
          <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"
@@ -6771,6 +7243,15 @@
          </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:math="http://www.w3.org/2005/xpath-functions/math"
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 6dc0510c66..77ec36876c 100644
--- a/json/convert/oscal_assessment-results_xml-to-json-converter.xsl
+++ b/json/convert/oscal_assessment-results_xml-to-json-converter.xsl
@@ -87,7 +87,7 @@
                 _metaschema-json-id="/assembly/oscal-ar/assessment-results"
                 name="assessment-results"
                 key="assessment-results"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-results_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-results_metaschema.xml"
                 _key-name="oscal-ar:assessment-results"
                 _using-root-name="assessment-results"
                 gi="assessment-results">
@@ -118,7 +118,7 @@
                 _metaschema-json-id="/assembly/oscal-ar/assessment-results/metadata"
                 name="metadata"
                 key="metadata"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:metadata"
                 _step="metadata"
                 _key="metadata"
@@ -194,7 +194,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/revision/prop"
                 _metaschema-json-id="/assembly/oscal-metadata/revision/props"
                 name="property"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:property"
                 _step="prop"
                 _key="props"
@@ -217,7 +217,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/revision/link"
                 _metaschema-json-id="/assembly/oscal-metadata/revision/links"
                 name="link"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:link"
                 _step="link"
                 _key="links"
@@ -238,7 +238,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/role"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/roles"
                 name="role"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:role"
                 _step="role"
                 _key="roles"
@@ -274,7 +274,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/location"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/locations"
                 name="location"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:location"
                 _step="location"
                 _key="locations"
@@ -330,7 +330,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/party"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/parties"
                 name="party"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:party"
                 _step="party"
                 _key="parties"
@@ -408,7 +408,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/responsible-party"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/responsible-parties"
                 name="responsible-party"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:responsible-party"
                 _step="responsible-party"
                 _key="responsible-parties"
@@ -449,7 +449,7 @@
                 _metaschema-json-id="/assembly/oscal-ar/assessment-results/import-ap"
                 name="import-ap"
                 key="import-ap"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-results_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-results_metaschema.xml"
                 _key-name="oscal-ar:import-ap"
                 _step="import-ap"
                 _key="import-ap"
@@ -471,7 +471,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ar/assessment-results/local-definitions/objectives-and-methods"
                 _metaschema-json-id="/assembly/oscal-ar/assessment-results/local-definitions/objectives-and-methods"
                 name="local-objective"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:local-objective"
                 _step="objectives-and-methods"
                 _key="objectives-and-methods"
@@ -512,7 +512,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/local-objective/part"
                 _metaschema-json-id="/assembly/oscal-assessment-common/local-objective/parts"
                 name="part"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
                 _key-name="oscal-catalog-common:part"
                 _step="part"
                 _key="parts"
@@ -533,7 +533,29 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:apply-templates select=""/>
+         <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                             group-by="true()">
+            <field in-json="SCALAR"
+                   _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+                   _key="prose"
+                   _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
+                   _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 in-json="string"
+                      as-type="markup-multiline"
+                      _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                      _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE">
+                  <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+               </value>
+            </field>
+         </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()">
@@ -556,7 +578,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ar/result/attestation/part"
                 _metaschema-json-id="/assembly/oscal-ar/result/attestations/parts"
                 name="assessment-part"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:assessment-part"
                 _step="part"
                 _key="parts"
@@ -577,7 +599,29 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:apply-templates select=""/>
+         <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                             group-by="true()">
+            <field in-json="SCALAR"
+                   _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+                   _key="prose"
+                   _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/p ul ol pre table h1 h2 h3 h4 h5 h6"
+                   _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 in-json="string"
+                      as-type="markup-multiline"
+                      _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                      _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE">
+                  <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+               </value>
+            </field>
+         </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()">
@@ -600,7 +644,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ar/assessment-results/local-definitions/activity"
                 _metaschema-json-id="/assembly/oscal-ar/assessment-results/local-definitions/activities"
                 name="activity"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:activity"
                 _step="activity"
                 _key="activities"
@@ -651,7 +695,7 @@
                 _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps/reviewed-controls"
                 name="reviewed-controls"
                 key="reviewed-controls"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:reviewed-controls"
                 _step="reviewed-controls"
                 _key="reviewed-controls"
@@ -702,7 +746,7 @@
                 _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/include-objective"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/include-objectives"
                 name="select-objective-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-objective-by-id"
                 _step="include-objective"
                 _key="include-objectives"
@@ -721,7 +765,7 @@
                 _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/exclude-objective"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/exclude-objectives"
                 name="select-objective-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-objective-by-id"
                 _step="exclude-objective"
                 _key="exclude-objectives"
@@ -739,7 +783,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/activity/step/responsible-role"
                 _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps/responsible-roles"
                 name="responsible-role"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:responsible-role"
                 _step="responsible-role"
                 _key="responsible-roles"
@@ -780,7 +824,7 @@
                 _metaschema-json-id="/assembly/oscal-assessment-common/activity/related-controls"
                 name="reviewed-controls"
                 key="related-controls"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:reviewed-controls"
                 _step="related-controls"
                 _key="related-controls"
@@ -830,7 +874,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ar/assessment-results/result"
                 _metaschema-json-id="/assembly/oscal-ar/assessment-results/results"
                 name="result"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-results_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-results_metaschema.xml"
                 _key-name="oscal-ar:result"
                 _step="result"
                 _key="results"
@@ -898,7 +942,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ar/result/local-definitions/component"
                 _metaschema-json-id="/assembly/oscal-ar/result/local-definitions/components"
                 name="system-component"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:system-component"
                 _step="component"
                 _key="components"
@@ -950,7 +994,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/protocol"
                 _metaschema-json-id="/assembly/oscal-implementation-common/system-component/protocols"
                 name="protocol"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:protocol"
                 _step="protocol"
                 _key="protocols"
@@ -978,7 +1022,7 @@
                 _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/port-range"
                 _metaschema-json-id="/assembly/oscal-implementation-common/protocol/port-ranges"
                 name="port-range"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:port-range"
                 _step="port-range"
                 _key="port-ranges"
@@ -998,7 +1042,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ar/result/local-definitions/inventory-item"
                 _metaschema-json-id="/assembly/oscal-ar/result/local-definitions/inventory-items"
                 name="inventory-item"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:inventory-item"
                 _step="inventory-item"
                 _key="inventory-items"
@@ -1046,7 +1090,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ar/result/local-definitions/user"
                 _metaschema-json-id="/assembly/oscal-ar/result/local-definitions/users"
                 name="system-user"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:system-user"
                 _step="user"
                 _key="users"
@@ -1096,7 +1140,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/authorized-privilege"
                 _metaschema-json-id="/assembly/oscal-implementation-common/system-user/authorized-privileges"
                 name="authorized-privilege"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:authorized-privilege"
                 _step="authorized-privilege"
                 _key="authorized-privileges"
@@ -1123,7 +1167,7 @@
                 _metaschema-json-id="/assembly/oscal-ar/result/local-definitions/assessment-assets"
                 name="assessment-assets"
                 key="assessment-assets"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:assessment-assets"
                 _step="assessment-assets"
                 _key="assessment-assets"
@@ -1157,7 +1201,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ar/result/local-definitions/assessment-task"
                 _metaschema-json-id="/assembly/oscal-ar/result/local-definitions/tasks"
                 name="task"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:task"
                 _step="assessment-task"
                 _key="tasks"
@@ -1230,7 +1274,7 @@
                 _metaschema-xml-id="/assembly/oscal-assessment-common/task/task"
                 _metaschema-json-id="/assembly/oscal-assessment-common/task/tasks"
                 name="task"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:task"
                 _step="task"
                 _key="tasks"
@@ -1304,7 +1348,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/task/associated-activity/subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/task/associated-activities/subjects"
                 name="assessment-subject"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:assessment-subject"
                 _step="subject"
                 _key="subjects"
@@ -1353,7 +1397,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-subjects"
                 name="select-subject-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-subject-by-id"
                 _step="include-subject"
                 _key="include-subjects"
@@ -1387,7 +1431,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/exclude-subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/exclude-subjects"
                 name="select-subject-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-subject-by-id"
                 _step="exclude-subject"
                 _key="exclude-subjects"
@@ -1422,7 +1466,7 @@
                 _metaschema-xml-id="/assembly/oscal-ar/result/assessment-log/entry/logged-by"
                 _metaschema-json-id="/assembly/oscal-ar/result/assessment-log/entries/logged-by"
                 name="logged-by"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:logged-by"
                 _step="logged-by"
                 _key="logged-by"
@@ -1441,7 +1485,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ar/result/assessment-log/entry/related-task"
                 _metaschema-json-id="/assembly/oscal-ar/result/assessment-log/entries/related-tasks"
                 name="related-task"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:related-task"
                 _step="related-task"
                 _key="related-tasks"
@@ -1489,7 +1533,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ar/result/observation"
                 _metaschema-json-id="/assembly/oscal-ar/result/observations"
                 name="observation"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:observation"
                 _step="observation"
                 _key="observations"
@@ -1561,7 +1605,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/observation/origin"
                 _metaschema-json-id="/assembly/oscal-assessment-common/observation/origins"
                 name="origin"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:origin"
                 _step="origin"
                 _key="origins"
@@ -1595,7 +1639,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/origin/actor"
                 _metaschema-json-id="/assembly/oscal-assessment-common/origin/actors"
                 name="origin-actor"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:origin-actor"
                 _step="actor"
                 _key="actors"
@@ -1629,7 +1673,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ar/result/risk"
                 _metaschema-json-id="/assembly/oscal-ar/result/risks"
                 name="risk"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:risk"
                 _step="risk"
                 _key="risks"
@@ -1709,7 +1753,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/risk/characterization"
                 _metaschema-json-id="/assembly/oscal-assessment-common/risk/characterizations"
                 name="characterization"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:characterization"
                 _step="characterization"
                 _key="characterizations"
@@ -1748,7 +1792,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ar/result/finding"
                 _metaschema-json-id="/assembly/oscal-ar/result/findings"
                 name="finding"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-results_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-results_metaschema.xml"
                 _key-name="oscal-ar:finding"
                 _step="finding"
                 _key="findings"
@@ -1807,7 +1851,7 @@
                 _metaschema-json-id="/assembly/oscal-ar/finding/target"
                 name="finding-target"
                 key="target"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:finding-target"
                 _step="target"
                 _key="target"
@@ -1838,7 +1882,6 @@
             </group>
          </xsl:for-each-group>
          <xsl:apply-templates select="status"/>
-         <xsl:apply-templates select="reason"/>
          <xsl:apply-templates select="implementation-status"/>
          <xsl:apply-templates select="remarks"/>
       </assembly>
@@ -1850,7 +1893,7 @@
                 _metaschema-json-id="/assembly/oscal-assessment-common/finding-target/implementation-status"
                 name="implementation-status"
                 key="implementation-status"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:implementation-status"
                 _step="implementation-status"
                 _key="implementation-status"
@@ -1873,7 +1916,7 @@
                 _metaschema-json-id="/assembly/oscal-ar/assessment-results/back-matter"
                 name="back-matter"
                 key="back-matter"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:back-matter"
                 _step="back-matter"
                 _key="back-matter"
@@ -1904,7 +1947,7 @@
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:remarks"
              _step="remarks"
              _key="remarks"
@@ -1917,6 +1960,12 @@
          <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"
@@ -1927,7 +1976,7 @@
              collapsible="no"
              as-type="uuid"
              name="location-uuid"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:location-uuid"
              _step="location-uuid"
              _key="location-uuids"
@@ -1936,7 +1985,11 @@
              _in-xml-name="location-uuid"
              _in-json-name="location-uuids"
              gi="location-uuid"
-             in-json="SCALAR"/>
+             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">
@@ -1946,7 +1999,7 @@
              collapsible="no"
              as-type="uuid"
              name="party-uuid"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:party-uuid"
              _step="party-uuid"
              _key="party-uuids"
@@ -1955,7 +2008,11 @@
              _in-xml-name="party-uuid"
              _in-json-name="party-uuids"
              gi="party-uuid"
-             in-json="SCALAR"/>
+             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">
@@ -1965,7 +2022,7 @@
              collapsible="no"
              as-type="token"
              name="role-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:role-id"
              _step="role-id"
              _key="role-ids"
@@ -1974,7 +2031,11 @@
              _in-xml-name="role-id"
              _in-json-name="role-ids"
              gi="role-id"
-             in-json="SCALAR"/>
+             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">
@@ -1984,7 +2045,7 @@
              collapsible="no"
              as-type="string"
              name="function-performed"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
              _key-name="oscal-implementation-common:function-performed"
              _step="function-performed"
              _key="functions-performed"
@@ -1993,7 +2054,11 @@
              _in-xml-name="function-performed"
              _in-json-name="functions-performed"
              gi="function-performed"
-             in-json="SCALAR"/>
+             in-json="SCALAR">
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
    </xsl:template>
    <xsl:template match="threat-id"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
@@ -2003,7 +2068,7 @@
              collapsible="no"
              as-type="uri"
              name="threat-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
              _key-name="oscal-assessment-common:threat-id"
              _step="threat-id"
              _key="threat-ids"
@@ -2028,7 +2093,7 @@
              as-type="token"
              name="risk-status"
              key="status-change"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
              _key-name="oscal-assessment-common:risk-status"
              _step="status-change"
              _key="status-change"
@@ -2041,6 +2106,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status-change</xsl:attribute>
          </xsl:if>
+         <value as-type="token" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
       </field>
    </xsl:template>
    <xsl:template match="hash"
@@ -2051,7 +2119,7 @@
              collapsible="no"
              as-type="string"
              name="hash"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:hash"
              _step="hash"
              _key="hashes"
@@ -2210,7 +2278,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/link/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -2282,7 +2350,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/address/type"
             name="location-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:location-type"
             _step="type"
             _key="type"
@@ -2406,7 +2474,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/local-objective/control-id"
             name="control-id"
             key="control-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
             _key-name="oscal-catalog-common:control-id"
             _step="control-id"
             _key="control-id"
@@ -2529,7 +2597,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/control-id"
             name="control-id"
             key="control-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
             _key-name="oscal-catalog-common:control-id"
             _step="control-id"
             _key="control-id"
@@ -2549,7 +2617,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/select-objective-by-id/objective-id"
             name="objective-id"
             key="objective-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
             _key-name="oscal-assessment-common:objective-id"
             _step="objective-id"
             _key="objective-id"
@@ -2620,7 +2688,7 @@
             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/type"
             name="system-component-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
             _key-name="oscal-implementation-common:system-component-type"
             _step="type"
             _key="type"
@@ -3008,7 +3076,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/select-subject-by-id/subject-uuid"
             name="subject-uuid"
             key="subject-uuid"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
             _key-name="oscal-assessment-common:subject-uuid"
             _step="subject-uuid"
             _key="subject-uuid"
@@ -3028,7 +3096,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/select-subject-by-id/type"
             name="subject-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
             _key-name="oscal-assessment-common:subject-type"
             _step="type"
             _key="type"
@@ -3271,7 +3339,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/subject-reference/subject-uuid"
             name="subject-uuid"
             key="subject-uuid"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
             _key-name="oscal-assessment-common:subject-uuid"
             _step="subject-uuid"
             _key="subject-uuid"
@@ -3291,7 +3359,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/subject-reference/type"
             name="subject-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
             _key-name="oscal-assessment-common:subject-type"
             _step="type"
             _key="type"
@@ -3621,6 +3689,42 @@
          <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">
+      <flag in-json="string"
+            as-type="token"
+            _step="state"
+            _key="state"
+            _metaschema-xml-id="/assembly/oscal-assessment-common/finding-target/status/state"
+            _metaschema-json-id="/assembly/oscal-assessment-common/finding-target/status/state"
+            name="state"
+            key="state"
+            _using-name="state"
+            _in-xml-name="state"
+            _in-json-name="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">
+      <flag in-json="string"
+            as-type="token"
+            _step="reason"
+            _key="reason"
+            _metaschema-xml-id="/assembly/oscal-assessment-common/finding-target/status/reason"
+            _metaschema-json-id="/assembly/oscal-assessment-common/finding-target/status/reason"
+            name="reason"
+            key="reason"
+            _using-name="reason"
+            _in-xml-name="reason"
+            _in-json-name="reason"
+            gi="reason">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
    <xsl:template match="implementation-status/@state"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
@@ -3718,7 +3822,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -3773,7 +3877,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -3805,6 +3909,9 @@
          <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/published"
@@ -3817,7 +3924,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -3830,6 +3937,9 @@
          <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="assessment-results/metadata/last-modified"
@@ -3842,7 +3952,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -3855,6 +3965,9 @@
          <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="assessment-results/metadata/version"
@@ -3867,7 +3980,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -3880,6 +3993,9 @@
          <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-results/metadata/oscal-version"
@@ -3892,7 +4008,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -3905,6 +4021,9 @@
          <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-results/metadata/revisions/revision"
@@ -3914,7 +4033,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/revisions/revision"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/revisions"
                 name="revision"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:revision"
                 _step="revisions/revision"
                 _key="revisions"
@@ -3954,7 +4073,7 @@
              group-json="ARRAY"
              name="revision"
              key="revisions"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:revision"
              _key-ref="oscal-metadata:revision">
          <xsl:if test="$with-key">
@@ -3983,6 +4102,9 @@
          <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/revisions/revision/published"
@@ -3995,7 +4117,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -4008,6 +4130,9 @@
          <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="assessment-results/metadata/revisions/revision/last-modified"
@@ -4020,7 +4145,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -4033,6 +4158,9 @@
          <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="assessment-results/metadata/revisions/revision/version"
@@ -4045,7 +4173,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -4058,6 +4186,9 @@
          <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-results/metadata/revisions/revision/oscal-version"
@@ -4070,7 +4201,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -4083,6 +4214,9 @@
          <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-results/metadata/revisions/revision/link/text"
@@ -4105,6 +4239,9 @@
          <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/document-id"
@@ -4116,7 +4253,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -4151,6 +4288,9 @@
          <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/role/title"
@@ -4173,6 +4313,9 @@
          <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/role/short-name"
@@ -4195,6 +4338,9 @@
          <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"
@@ -4218,6 +4364,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -4240,6 +4392,9 @@
          <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/title"
@@ -4262,6 +4417,9 @@
          <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"
@@ -4272,7 +4430,7 @@
                 _metaschema-json-id="/assembly/oscal-metadata/location/address"
                 name="address"
                 key="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="address"
@@ -4307,7 +4465,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -4316,7 +4474,11 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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"
@@ -4338,6 +4500,9 @@
          <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="assessment-results/metadata/location/address/state"
@@ -4360,6 +4525,9 @@
          <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="assessment-results/metadata/location/address/postal-code"
@@ -4382,6 +4550,9 @@
          <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="assessment-results/metadata/location/address/country"
@@ -4404,6 +4575,9 @@
          <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="assessment-results/metadata/location/email-address"
@@ -4415,7 +4589,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -4424,7 +4598,11 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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"
@@ -4435,7 +4613,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -4465,7 +4643,11 @@
              _in-xml-name="url"
              _in-json-name="urls"
              gi="url"
-             in-json="SCALAR"/>
+             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"
@@ -4487,6 +4669,9 @@
          <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/name"
@@ -4509,6 +4694,9 @@
          <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="assessment-results/metadata/party/short-name"
@@ -4531,6 +4719,9 @@
          <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/party/external-id"
@@ -4574,6 +4765,9 @@
          <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/email-address"
@@ -4585,7 +4779,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -4594,7 +4788,11 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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"
@@ -4605,7 +4803,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -4627,7 +4825,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/party/address"
                 _metaschema-json-id="/assembly/oscal-metadata/party/addresses"
                 name="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="addresses"
@@ -4659,7 +4857,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -4668,7 +4866,11 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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"
@@ -4690,6 +4892,9 @@
          <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="assessment-results/metadata/party/address/state"
@@ -4712,6 +4917,9 @@
          <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="assessment-results/metadata/party/address/postal-code"
@@ -4734,6 +4942,9 @@
          <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="assessment-results/metadata/party/address/country"
@@ -4756,6 +4967,9 @@
          <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="assessment-results/metadata/party/member-of-organization"
@@ -4773,7 +4987,11 @@
              _in-xml-name="member-of-organization"
              _in-json-name="member-of-organizations"
              gi="member-of-organization"
-             in-json="SCALAR"/>
+             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"
@@ -4795,6 +5013,9 @@
          <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"
@@ -4852,6 +5073,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/objectives-and-methods/link/text"
@@ -4874,6 +5101,9 @@
          <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/title"
@@ -4896,28 +5126,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-results/local-definitions/objectives-and-methods//part"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _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"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl: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"
@@ -4940,6 +5151,9 @@
          <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/title"
@@ -4962,6 +5176,9 @@
          <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/description"
@@ -4985,6 +5202,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -5007,6 +5230,9 @@
          <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"
@@ -5070,6 +5296,9 @@
          <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/description"
@@ -5093,6 +5322,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/link/text"
@@ -5115,6 +5350,9 @@
          <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/description"
@@ -5138,6 +5376,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/link/text"
@@ -5160,6 +5404,9 @@
          <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"
@@ -5229,6 +5476,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -5251,6 +5504,9 @@
          <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/include-all"
@@ -5280,7 +5536,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="include-control"
                 _key="include-controls"
@@ -5314,7 +5570,11 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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"
@@ -5323,7 +5583,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/exclude-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/exclude-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="exclude-control"
                 _key="exclude-controls"
@@ -5357,7 +5617,11 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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"
@@ -5426,6 +5690,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -5448,6 +5718,9 @@
          <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-objective-selection/include-all"
@@ -5490,6 +5763,9 @@
          <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/related-controls/description"
@@ -5513,6 +5789,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -5535,6 +5817,9 @@
          <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/related-controls/control-selection"
@@ -5604,6 +5889,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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-selection/link/text"
@@ -5626,6 +5917,9 @@
          <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/related-controls/control-selection/include-all"
@@ -5655,7 +5949,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="include-control"
                 _key="include-controls"
@@ -5689,7 +5983,11 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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"
@@ -5698,7 +5996,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/exclude-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/exclude-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="exclude-control"
                 _key="exclude-controls"
@@ -5732,7 +6030,11 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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"
@@ -5801,6 +6103,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -5823,6 +6131,9 @@
          <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/related-controls/control-objective-selection/include-all"
@@ -5865,6 +6176,9 @@
          <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/title"
@@ -5887,6 +6201,9 @@
          <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"
@@ -5910,6 +6227,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/start"
@@ -5932,6 +6255,9 @@
          <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"
@@ -5954,6 +6280,9 @@
          <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/link/text"
@@ -5976,6 +6305,9 @@
          <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"
@@ -6046,6 +6378,9 @@
          <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/component/description"
@@ -6069,6 +6404,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/component/purpose"
@@ -6091,6 +6432,9 @@
          <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-results/result/local-definitions/component/link/text"
@@ -6113,6 +6457,9 @@
          <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/component/status"
@@ -6156,6 +6503,9 @@
          <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/component/protocol/title"
@@ -6178,6 +6528,9 @@
          <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/inventory-item/description"
@@ -6201,6 +6554,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/link/text"
@@ -6223,6 +6582,9 @@
          <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"
@@ -6245,6 +6607,9 @@
          <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/implemented-component"
@@ -6305,6 +6670,9 @@
          <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/implemented-component/responsible-party/link/text"
@@ -6327,6 +6695,9 @@
          <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/user/title"
@@ -6349,6 +6720,9 @@
          <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/user/short-name"
@@ -6371,6 +6745,9 @@
          <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"
@@ -6394,6 +6771,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/user/link/text"
@@ -6416,6 +6799,9 @@
          <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/user/authorized-privilege/title"
@@ -6438,6 +6824,9 @@
          <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/user/authorized-privilege/description"
@@ -6461,6 +6850,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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-assets/component/title"
@@ -6483,6 +6878,9 @@
          <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-assets/component/description"
@@ -6506,6 +6904,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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-assets/component/purpose"
@@ -6528,6 +6932,9 @@
          <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-results/result/local-definitions/assessment-assets/component/link/text"
@@ -6550,6 +6957,9 @@
          <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/component/status"
@@ -6593,6 +7003,9 @@
          <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/component/protocol/title"
@@ -6615,6 +7028,9 @@
          <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-assets/assessment-platform"
@@ -6676,6 +7092,9 @@
          <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-assets/assessment-platform/link/text"
@@ -6698,6 +7117,9 @@
          <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"
@@ -6758,6 +7180,9 @@
          <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"
@@ -6780,6 +7205,9 @@
          <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"
@@ -6802,6 +7230,9 @@
          <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"
@@ -6825,6 +7256,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/link/text"
@@ -6847,6 +7284,9 @@
          <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/timing"
@@ -7018,6 +7458,9 @@
          <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/associated-activity/responsible-role/link/text"
@@ -7040,6 +7483,9 @@
          <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/associated-activity/subject/description"
@@ -7063,6 +7509,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -7085,6 +7537,9 @@
          <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/associated-activity/subject/include-all"
@@ -7127,6 +7582,9 @@
          <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/associated-activity/subject/exclude-subject/link/text"
@@ -7149,6 +7607,9 @@
          <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/subject/description"
@@ -7172,6 +7633,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/subject/link/text"
@@ -7194,6 +7661,9 @@
          <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/subject/include-all"
@@ -7236,6 +7706,9 @@
          <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/subject/exclude-subject/link/text"
@@ -7258,6 +7731,9 @@
          <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/responsible-role/link/text"
@@ -7280,6 +7756,9 @@
          <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/reviewed-controls/description"
@@ -7303,6 +7782,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/reviewed-controls/link/text"
@@ -7325,6 +7810,9 @@
          <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/reviewed-controls/control-selection"
@@ -7394,6 +7882,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/reviewed-controls/control-selection/link/text"
@@ -7416,6 +7910,9 @@
          <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/reviewed-controls/control-selection/include-all"
@@ -7445,7 +7942,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="include-control"
                 _key="include-controls"
@@ -7479,7 +7976,11 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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"
@@ -7488,7 +7989,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/exclude-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/exclude-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="exclude-control"
                 _key="exclude-controls"
@@ -7522,7 +8023,11 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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"
@@ -7591,6 +8096,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/reviewed-controls/control-objective-selection/link/text"
@@ -7613,6 +8124,9 @@
          <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/reviewed-controls/control-objective-selection/include-all"
@@ -7684,6 +8198,9 @@
          <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/attestation//part/title"
@@ -7706,28 +8223,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/attestation//part"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _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"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl: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"
@@ -7750,6 +8248,9 @@
          <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/assessment-log"
@@ -7847,6 +8348,9 @@
          <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/assessment-log/entry/description"
@@ -7870,6 +8374,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -7892,6 +8402,9 @@
          <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/assessment-log/entry/end"
@@ -7914,6 +8427,9 @@
          <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/assessment-log/entry/link/text"
@@ -7936,6 +8452,9 @@
          <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/assessment-log/entry/related-task/link/text"
@@ -7958,6 +8477,9 @@
          <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/assessment-log/entry/related-task/responsible-party/link/text"
@@ -7980,6 +8502,9 @@
          <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/assessment-log/entry/related-task/subject/description"
@@ -8003,6 +8528,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/related-task/subject/link/text"
@@ -8025,6 +8556,9 @@
          <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/assessment-log/entry/related-task/subject/include-all"
@@ -8067,6 +8601,9 @@
          <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/assessment-log/entry/related-task/subject/exclude-subject/link/text"
@@ -8089,6 +8626,9 @@
          <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/assessment-log/entry/related-task/identified-subject"
@@ -8139,6 +8679,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/related-task/identified-subject/subject/link/text"
@@ -8161,6 +8707,9 @@
          <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/assessment-log/entry/related-task/identified-subject/subject/include-all"
@@ -8203,6 +8752,9 @@
          <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/assessment-log/entry/related-task/identified-subject/subject/exclude-subject/link/text"
@@ -8225,6 +8777,9 @@
          <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/title"
@@ -8247,6 +8802,9 @@
          <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/description"
@@ -8270,6 +8828,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/link/text"
@@ -8292,6 +8856,9 @@
          <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/method"
@@ -8309,7 +8876,11 @@
              _in-xml-name="method"
              _in-json-name="methods"
              gi="method"
-             in-json="SCALAR"/>
+             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"
@@ -8326,7 +8897,11 @@
              _in-xml-name="type"
              _in-json-name="types"
              gi="type"
-             in-json="SCALAR"/>
+             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"
@@ -8348,6 +8923,9 @@
          <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/link/text"
@@ -8370,6 +8948,9 @@
          <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/responsible-party/link/text"
@@ -8392,6 +8973,9 @@
          <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/subject/description"
@@ -8415,6 +8999,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/related-task/subject/link/text"
@@ -8437,6 +9027,9 @@
          <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/subject/include-all"
@@ -8479,6 +9072,9 @@
          <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/subject/exclude-subject/link/text"
@@ -8501,6 +9097,9 @@
          <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"
@@ -8551,6 +9150,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/related-task/identified-subject/subject/link/text"
@@ -8573,6 +9178,9 @@
          <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-all"
@@ -8615,6 +9223,9 @@
          <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"
@@ -8637,6 +9248,9 @@
          <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/subject"
@@ -8646,7 +9260,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/observation/subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/observation/subjects"
                 name="subject-reference"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:subject-reference"
                 _step="subject"
                 _key="subjects"
@@ -8695,6 +9309,9 @@
          <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"
@@ -8717,6 +9334,9 @@
          <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"
@@ -8772,6 +9392,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -8794,6 +9420,9 @@
          <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"
@@ -8816,6 +9445,9 @@
          <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"
@@ -8838,6 +9470,9 @@
          <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"
@@ -8860,6 +9495,9 @@
          <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/description"
@@ -8883,6 +9521,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -8906,6 +9550,12 @@
          <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()">
+               <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"
@@ -8928,6 +9578,9 @@
          <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/status"
@@ -8950,6 +9603,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
+         <value as-type="token" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/origin/actor/link/text"
@@ -8972,6 +9628,9 @@
          <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/origin/related-task/link/text"
@@ -8994,6 +9653,9 @@
          <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/origin/related-task/responsible-party/link/text"
@@ -9016,6 +9678,9 @@
          <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/origin/related-task/subject/description"
@@ -9039,6 +9704,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/subject/link/text"
@@ -9061,6 +9732,9 @@
          <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/origin/related-task/subject/include-all"
@@ -9103,6 +9777,9 @@
          <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/origin/related-task/subject/exclude-subject/link/text"
@@ -9125,6 +9802,9 @@
          <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/origin/related-task/identified-subject"
@@ -9175,6 +9855,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -9197,6 +9883,9 @@
          <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/origin/related-task/identified-subject/subject/include-all"
@@ -9239,6 +9928,9 @@
          <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/origin/related-task/identified-subject/subject/exclude-subject/link/text"
@@ -9261,6 +9953,9 @@
          <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/characterization/link/text"
@@ -9283,6 +9978,9 @@
          <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/characterization/origin/actor/link/text"
@@ -9305,6 +10003,9 @@
          <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/characterization/origin/related-task/link/text"
@@ -9327,6 +10028,9 @@
          <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/characterization/origin/related-task/responsible-party/link/text"
@@ -9349,6 +10053,9 @@
          <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/characterization/origin/related-task/subject/description"
@@ -9372,6 +10079,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/subject/link/text"
@@ -9394,6 +10107,9 @@
          <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/characterization/origin/related-task/subject/include-all"
@@ -9436,6 +10152,9 @@
          <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/characterization/origin/related-task/subject/exclude-subject/link/text"
@@ -9458,6 +10177,9 @@
          <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/characterization/origin/related-task/identified-subject"
@@ -9508,6 +10230,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/identified-subject/subject/link/text"
@@ -9530,6 +10258,9 @@
          <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/characterization/origin/related-task/identified-subject/subject/include-all"
@@ -9572,6 +10303,9 @@
          <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/characterization/origin/related-task/identified-subject/subject/exclude-subject/link/text"
@@ -9594,6 +10328,9 @@
          <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/characterization/facet"
@@ -9649,6 +10386,9 @@
          <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"
@@ -9711,6 +10451,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/mitigating-factor/link/text"
@@ -9733,6 +10479,9 @@
          <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"
@@ -9742,7 +10491,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/risk/mitigating-factor/subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/risk/mitigating-factors/subjects"
                 name="subject-reference"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:subject-reference"
                 _step="subject"
                 _key="subjects"
@@ -9791,6 +10540,9 @@
          <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/mitigating-factor/subject/link/text"
@@ -9813,6 +10565,9 @@
          <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/deadline"
@@ -9835,6 +10590,9 @@
          <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"
@@ -9844,7 +10602,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/risk/response"
                 _metaschema-json-id="/assembly/oscal-assessment-common/risk/remediations"
                 name="response"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:response"
                 _step="response"
                 _key="remediations"
@@ -9915,6 +10673,9 @@
          <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"
@@ -9938,6 +10699,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/link/text"
@@ -9960,6 +10727,9 @@
          <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"
@@ -9982,6 +10752,9 @@
          <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/related-task/link/text"
@@ -10004,6 +10777,9 @@
          <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/related-task/responsible-party/link/text"
@@ -10026,6 +10802,9 @@
          <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/related-task/subject/description"
@@ -10049,6 +10828,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/origin/related-task/subject/link/text"
@@ -10071,6 +10856,9 @@
          <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/related-task/subject/include-all"
@@ -10113,6 +10901,9 @@
          <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/related-task/subject/exclude-subject/link/text"
@@ -10135,6 +10926,9 @@
          <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/related-task/identified-subject"
@@ -10185,6 +10979,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/origin/related-task/identified-subject/subject/link/text"
@@ -10207,6 +11007,9 @@
          <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/related-task/identified-subject/subject/include-all"
@@ -10249,6 +11052,9 @@
          <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/related-task/identified-subject/subject/exclude-subject/link/text"
@@ -10271,6 +11077,9 @@
          <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/required-asset"
@@ -10320,7 +11129,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/response/required-asset/subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/response/required-assets/subjects"
                 name="subject-reference"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:subject-reference"
                 _step="subject"
                 _key="subjects"
@@ -10369,6 +11178,9 @@
          <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/subject/link/text"
@@ -10391,6 +11203,9 @@
          <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/required-asset/title"
@@ -10413,6 +11228,9 @@
          <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"
@@ -10436,6 +11254,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/link/text"
@@ -10458,6 +11282,9 @@
          <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//task/title"
@@ -10480,6 +11307,9 @@
          <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//task/description"
@@ -10503,6 +11333,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/link/text"
@@ -10525,6 +11361,9 @@
          <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//task/timing"
@@ -10696,6 +11535,9 @@
          <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//task/associated-activity/responsible-role/link/text"
@@ -10718,6 +11560,9 @@
          <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//task/associated-activity/subject/description"
@@ -10741,6 +11586,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -10763,6 +11614,9 @@
          <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//task/associated-activity/subject/include-all"
@@ -10805,6 +11659,9 @@
          <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//task/associated-activity/subject/exclude-subject/link/text"
@@ -10827,6 +11684,9 @@
          <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//task/subject/description"
@@ -10850,6 +11710,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/subject/link/text"
@@ -10872,6 +11738,9 @@
          <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//task/subject/include-all"
@@ -10914,6 +11783,9 @@
          <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//task/subject/exclude-subject/link/text"
@@ -10936,6 +11808,9 @@
          <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//task/responsible-role/link/text"
@@ -10958,6 +11833,9 @@
          <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/risk-log"
@@ -11056,6 +11934,9 @@
          <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/risk-log/entry/description"
@@ -11079,6 +11960,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/risk-log/entry/start"
@@ -11101,6 +11988,9 @@
          <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"
@@ -11123,6 +12013,9 @@
          <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/risk/risk-log/entry/link/text"
@@ -11145,6 +12038,9 @@
          <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/risk-log/entry/related-response"
@@ -11205,6 +12101,9 @@
          <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/risk-log/entry/related-response/related-task/link/text"
@@ -11227,6 +12126,9 @@
          <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/risk-log/entry/related-response/related-task/responsible-party/link/text"
@@ -11249,6 +12151,9 @@
          <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/risk-log/entry/related-response/related-task/subject/description"
@@ -11272,6 +12177,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/risk-log/entry/related-response/related-task/subject/link/text"
@@ -11294,6 +12205,9 @@
          <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/risk-log/entry/related-response/related-task/subject/include-all"
@@ -11336,6 +12250,9 @@
          <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/risk-log/entry/related-response/related-task/subject/exclude-subject/link/text"
@@ -11358,6 +12275,9 @@
          <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/risk-log/entry/related-response/related-task/identified-subject"
@@ -11408,6 +12328,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/risk-log/entry/related-response/related-task/identified-subject/subject/link/text"
@@ -11430,6 +12356,9 @@
          <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/risk-log/entry/related-response/related-task/identified-subject/subject/include-all"
@@ -11472,6 +12401,9 @@
          <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/risk-log/entry/related-response/related-task/identified-subject/subject/exclude-subject/link/text"
@@ -11494,6 +12426,9 @@
          <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/related-observation"
@@ -11533,6 +12468,9 @@
          <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/description"
@@ -11556,6 +12494,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/link/text"
@@ -11578,6 +12522,9 @@
          <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/finding/origin/actor/link/text"
@@ -11600,6 +12547,9 @@
          <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/finding/origin/related-task/link/text"
@@ -11622,6 +12572,9 @@
          <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/finding/origin/related-task/responsible-party/link/text"
@@ -11644,6 +12597,9 @@
          <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/finding/origin/related-task/subject/description"
@@ -11667,6 +12623,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/origin/related-task/subject/link/text"
@@ -11689,6 +12651,9 @@
          <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/finding/origin/related-task/subject/include-all"
@@ -11731,6 +12696,9 @@
          <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/finding/origin/related-task/subject/exclude-subject/link/text"
@@ -11753,6 +12721,9 @@
          <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/finding/origin/related-task/identified-subject"
@@ -11803,6 +12774,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/origin/related-task/identified-subject/subject/link/text"
@@ -11825,6 +12802,9 @@
          <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/finding/origin/related-task/identified-subject/subject/include-all"
@@ -11867,6 +12847,9 @@
          <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/finding/origin/related-task/identified-subject/subject/exclude-subject/link/text"
@@ -11889,6 +12872,9 @@
          <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/finding/target/title"
@@ -11911,6 +12897,9 @@
          <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"
@@ -11934,6 +12923,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -11956,51 +12951,32 @@
          <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/finding/target/status"
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="status"
-             _key="status"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/finding-target/status"
-             _metaschema-json-id="/assembly/oscal-assessment-common/finding-target/status"
-             collapsible="no"
-             as-type="token"
-             name="status"
-             key="status"
-             _using-name="status"
-             _in-xml-name="status"
-             _in-json-name="status"
-             gi="status"
-             in-json="SCALAR">
+      <assembly _step="status"
+                _key="status"
+                _metaschema-xml-id="/assembly/oscal-assessment-common/finding-target/status"
+                _metaschema-json-id="/assembly/oscal-assessment-common/finding-target/status"
+                name="status"
+                key="status"
+                _using-name="status"
+                _in-xml-name="status"
+                _in-json-name="status"
+                gi="status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/finding/target/reason"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field _step="reason"
-             _key="reason"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/finding-target/reason"
-             _metaschema-json-id="/assembly/oscal-assessment-common/finding-target/reason"
-             collapsible="no"
-             as-type="NCName"
-             name="reason"
-             key="reason"
-             _using-name="reason"
-             _in-xml-name="reason"
-             _in-json-name="reason"
-             gi="reason"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">reason</xsl:attribute>
-         </xsl:if>
-      </field>
+         <xsl:apply-templates select="@state"/>
+         <xsl:apply-templates select="@reason"/>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/finding/implementation-statement-uuid"
                  priority="7"
@@ -12022,6 +12998,9 @@
          <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"
@@ -12120,6 +13099,9 @@
          <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/back-matter/resource/description"
@@ -12143,6 +13125,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/back-matter/resource/document-id"
@@ -12154,7 +13142,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -12223,6 +13211,9 @@
          <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/back-matter/resource/citation/link/text"
@@ -12245,6 +13236,9 @@
          <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/back-matter/resource/rlink"
@@ -12297,6 +13291,15 @@
          </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:math="http://www.w3.org/2005/xpath-functions/math"
diff --git a/json/convert/oscal_catalog_xml-to-json-converter.xsl b/json/convert/oscal_catalog_xml-to-json-converter.xsl
index 4138e53a55..fd257c7794 100644
--- a/json/convert/oscal_catalog_xml-to-json-converter.xsl
+++ b/json/convert/oscal_catalog_xml-to-json-converter.xsl
@@ -87,7 +87,7 @@
                 _metaschema-json-id="/assembly/oscal-catalog/catalog"
                 name="catalog"
                 key="catalog"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_catalog_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_catalog_metaschema.xml"
                 _key-name="oscal-catalog:catalog"
                 _using-root-name="catalog"
                 gi="catalog">
@@ -130,7 +130,7 @@
                 _metaschema-json-id="/assembly/oscal-catalog/catalog/metadata"
                 name="metadata"
                 key="metadata"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:metadata"
                 _step="metadata"
                 _key="metadata"
@@ -206,7 +206,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/revision/prop"
                 _metaschema-json-id="/assembly/oscal-metadata/revision/props"
                 name="property"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:property"
                 _step="prop"
                 _key="props"
@@ -229,7 +229,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/revision/link"
                 _metaschema-json-id="/assembly/oscal-metadata/revision/links"
                 name="link"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:link"
                 _step="link"
                 _key="links"
@@ -250,7 +250,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/role"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/roles"
                 name="role"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:role"
                 _step="role"
                 _key="roles"
@@ -286,7 +286,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/location"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/locations"
                 name="location"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:location"
                 _step="location"
                 _key="locations"
@@ -342,7 +342,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/party"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/parties"
                 name="party"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:party"
                 _step="party"
                 _key="parties"
@@ -420,7 +420,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/responsible-party"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/responsible-parties"
                 name="responsible-party"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:responsible-party"
                 _step="responsible-party"
                 _key="responsible-parties"
@@ -460,7 +460,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-catalog/catalog/param"
                 _metaschema-json-id="/assembly/oscal-catalog/catalog/params"
                 name="parameter"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
                 _key-name="oscal-catalog-common:parameter"
                 _step="param"
                 _key="params"
@@ -519,7 +519,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/constraint"
                 _metaschema-json-id="/assembly/oscal-catalog-common/parameter/constraints"
                 name="parameter-constraint"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
                 _key-name="oscal-catalog-common:parameter-constraint"
                 _step="constraint"
                 _key="constraints"
@@ -544,7 +544,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/guideline"
                 _metaschema-json-id="/assembly/oscal-catalog-common/parameter/guidelines"
                 name="parameter-guideline"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
                 _key-name="oscal-catalog-common:parameter-guideline"
                 _step="guideline"
                 _key="guidelines"
@@ -553,7 +553,29 @@
                 _in-xml-name="guideline"
                 _in-json-name="guidelines"
                 gi="guideline">
-         <xsl:apply-templates select=""/>
+         <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                             group-by="true()">
+            <field in-json="SCALAR"
+                   _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+                   _key="prose"
+                   _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
+                   _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 in-json="string"
+                      as-type="markup-multiline"
+                      _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                      _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE">
+                  <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+               </value>
+            </field>
+         </xsl:for-each-group>
       </assembly>
    </xsl:template>
    <xsl:template match="select"
@@ -563,7 +585,7 @@
                 _metaschema-json-id="/assembly/oscal-catalog-common/parameter/select"
                 name="parameter-selection"
                 key="select"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
                 _key-name="oscal-catalog-common:parameter-selection"
                 _step="select"
                 _key="select"
@@ -591,7 +613,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-catalog/catalog/control"
                 _metaschema-json-id="/assembly/oscal-catalog/catalog/controls"
                 name="control"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_catalog_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_catalog_metaschema.xml"
                 _key-name="oscal-catalog:control"
                 _step="control"
                 _key="controls"
@@ -646,7 +668,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-catalog/control/part"
                 _metaschema-json-id="/assembly/oscal-catalog/control/parts"
                 name="part"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
                 _key-name="oscal-catalog-common:part"
                 _step="part"
                 _key="parts"
@@ -667,7 +689,29 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:apply-templates select=""/>
+         <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                             group-by="true()">
+            <field in-json="SCALAR"
+                   _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+                   _key="prose"
+                   _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
+                   _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 in-json="string"
+                      as-type="markup-multiline"
+                      _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                      _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE">
+                  <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+               </value>
+            </field>
+         </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()">
@@ -690,7 +734,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-catalog/catalog/group"
                 _metaschema-json-id="/assembly/oscal-catalog/catalog/groups"
                 name="group"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_catalog_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_catalog_metaschema.xml"
                 _key-name="oscal-catalog:group"
                 _step="group"
                 _key="groups"
@@ -753,7 +797,7 @@
                 _metaschema-json-id="/assembly/oscal-catalog/catalog/back-matter"
                 name="back-matter"
                 key="back-matter"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:back-matter"
                 _step="back-matter"
                 _key="back-matter"
@@ -784,7 +828,7 @@
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:remarks"
              _step="remarks"
              _key="remarks"
@@ -797,6 +841,12 @@
          <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"
@@ -807,7 +857,7 @@
              collapsible="no"
              as-type="uuid"
              name="location-uuid"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:location-uuid"
              _step="location-uuid"
              _key="location-uuids"
@@ -816,7 +866,11 @@
              _in-xml-name="location-uuid"
              _in-json-name="location-uuids"
              gi="location-uuid"
-             in-json="SCALAR"/>
+             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">
@@ -826,7 +880,7 @@
              collapsible="no"
              as-type="uuid"
              name="party-uuid"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:party-uuid"
              _step="party-uuid"
              _key="party-uuids"
@@ -835,7 +889,11 @@
              _in-xml-name="party-uuid"
              _in-json-name="party-uuids"
              gi="party-uuid"
-             in-json="SCALAR"/>
+             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">
@@ -845,7 +903,7 @@
              collapsible="no"
              as-type="string"
              name="parameter-value"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
              _key-name="oscal-catalog-common:parameter-value"
              _step="value"
              _key="values"
@@ -854,7 +912,11 @@
              _in-xml-name="value"
              _in-json-name="values"
              gi="value"
-             in-json="SCALAR"/>
+             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">
@@ -864,7 +926,7 @@
              collapsible="no"
              as-type="string"
              name="hash"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:hash"
              _step="hash"
              _key="hashes"
@@ -1023,7 +1085,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/link/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -1095,7 +1157,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/address/type"
             name="location-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:location-type"
             _step="type"
             _key="type"
@@ -1236,7 +1298,7 @@
             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/depends-on"
             name="depends-on"
             key="depends-on"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
             _key-name="oscal-catalog-common:depends-on"
             _step="depends-on"
             _key="depends-on"
@@ -1445,7 +1507,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -1500,7 +1562,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -1532,6 +1594,9 @@
          <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/metadata/published"
@@ -1544,7 +1609,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -1557,6 +1622,9 @@
          <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="catalog/metadata/last-modified"
@@ -1569,7 +1637,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -1582,6 +1650,9 @@
          <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="catalog/metadata/version"
@@ -1594,7 +1665,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -1607,6 +1678,9 @@
          <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="catalog/metadata/oscal-version"
@@ -1619,7 +1693,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -1632,6 +1706,9 @@
          <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="catalog/metadata/revisions/revision"
@@ -1641,7 +1718,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/revisions/revision"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/revisions"
                 name="revision"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:revision"
                 _step="revisions/revision"
                 _key="revisions"
@@ -1681,7 +1758,7 @@
              group-json="ARRAY"
              name="revision"
              key="revisions"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:revision"
              _key-ref="oscal-metadata:revision">
          <xsl:if test="$with-key">
@@ -1710,6 +1787,9 @@
          <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/metadata/revisions/revision/published"
@@ -1722,7 +1802,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -1735,6 +1815,9 @@
          <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="catalog/metadata/revisions/revision/last-modified"
@@ -1747,7 +1830,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -1760,6 +1843,9 @@
          <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="catalog/metadata/revisions/revision/version"
@@ -1772,7 +1858,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -1785,6 +1871,9 @@
          <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="catalog/metadata/revisions/revision/oscal-version"
@@ -1797,7 +1886,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -1810,6 +1899,9 @@
          <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="catalog/metadata/revisions/revision/link/text"
@@ -1832,6 +1924,9 @@
          <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/document-id"
@@ -1843,7 +1938,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -1878,6 +1973,9 @@
          <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/role/title"
@@ -1900,6 +1998,9 @@
          <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/metadata/role/short-name"
@@ -1922,6 +2023,9 @@
          <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="catalog/metadata/role/description"
@@ -1945,6 +2049,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/metadata/role/link/text"
@@ -1967,6 +2077,9 @@
          <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/location/title"
@@ -1989,6 +2102,9 @@
          <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/metadata/location/address"
@@ -1999,7 +2115,7 @@
                 _metaschema-json-id="/assembly/oscal-metadata/location/address"
                 name="address"
                 key="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="address"
@@ -2034,7 +2150,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -2043,7 +2159,11 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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"
@@ -2065,6 +2185,9 @@
          <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="catalog/metadata/location/address/state"
@@ -2087,6 +2210,9 @@
          <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="catalog/metadata/location/address/postal-code"
@@ -2109,6 +2235,9 @@
          <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="catalog/metadata/location/address/country"
@@ -2131,6 +2260,9 @@
          <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="catalog/metadata/location/email-address"
@@ -2142,7 +2274,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -2151,7 +2283,11 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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"
@@ -2162,7 +2298,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -2192,7 +2328,11 @@
              _in-xml-name="url"
              _in-json-name="urls"
              gi="url"
-             in-json="SCALAR"/>
+             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"
@@ -2214,6 +2354,9 @@
          <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/party/name"
@@ -2236,6 +2379,9 @@
          <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="catalog/metadata/party/short-name"
@@ -2258,6 +2404,9 @@
          <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="catalog/metadata/party/external-id"
@@ -2301,6 +2450,9 @@
          <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/party/email-address"
@@ -2312,7 +2464,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -2321,7 +2473,11 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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"
@@ -2332,7 +2488,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -2354,7 +2510,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/party/address"
                 _metaschema-json-id="/assembly/oscal-metadata/party/addresses"
                 name="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="addresses"
@@ -2386,7 +2542,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -2395,7 +2551,11 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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"
@@ -2417,6 +2577,9 @@
          <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="catalog/metadata/party/address/state"
@@ -2439,6 +2602,9 @@
          <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="catalog/metadata/party/address/postal-code"
@@ -2461,6 +2627,9 @@
          <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="catalog/metadata/party/address/country"
@@ -2483,6 +2652,9 @@
          <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="catalog/metadata/party/member-of-organization"
@@ -2500,7 +2672,11 @@
              _in-xml-name="member-of-organization"
              _in-json-name="member-of-organizations"
              gi="member-of-organization"
-             in-json="SCALAR"/>
+             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"
@@ -2522,6 +2698,9 @@
          <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/param/link/text"
@@ -2544,6 +2723,9 @@
          <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/param/label"
@@ -2566,6 +2748,9 @@
          <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="catalog/param/usage"
@@ -2589,6 +2774,12 @@
          <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()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
+         </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog/param/constraint/description"
@@ -2612,6 +2803,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/param/constraint/test"
@@ -2651,28 +2848,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
-      </field>
-   </xsl:template>
-   <xsl:template match="catalog/param/guideline"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _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"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog/param/select/choice"
@@ -2690,7 +2868,11 @@
              _in-xml-name="choice"
              _in-json-name="choice"
              gi="choice"
-             in-json="SCALAR"/>
+             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"
@@ -2712,6 +2894,9 @@
          <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//control/param/link/text"
@@ -2734,6 +2919,9 @@
          <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/param/label"
@@ -2756,6 +2944,9 @@
          <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="catalog//control/param/usage"
@@ -2779,6 +2970,12 @@
          <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()">
+               <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"
@@ -2802,6 +2999,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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//control/param/constraint/test"
@@ -2841,28 +3044,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
-      </field>
-   </xsl:template>
-   <xsl:template match="catalog//control/param/guideline"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _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"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog//control/param/select/choice"
@@ -2880,7 +3064,11 @@
              _in-xml-name="choice"
              _in-json-name="choice"
              gi="choice"
-             in-json="SCALAR"/>
+             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"
@@ -2902,6 +3090,9 @@
          <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//part/title"
@@ -2924,28 +3115,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
-      </field>
-   </xsl:template>
-   <xsl:template match="catalog//control//part"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _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"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl: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//part/link/text"
@@ -2968,6 +3140,9 @@
          <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/title"
@@ -2990,6 +3165,9 @@
          <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//group/param/link/text"
@@ -3012,6 +3190,9 @@
          <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/param/label"
@@ -3034,6 +3215,9 @@
          <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="catalog//group/param/usage"
@@ -3057,6 +3241,12 @@
          <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()">
+               <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"
@@ -3080,6 +3270,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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//group/param/constraint/test"
@@ -3119,28 +3315,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
-      </field>
-   </xsl:template>
-   <xsl:template match="catalog//group/param/guideline"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _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"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog//group/param/select/choice"
@@ -3158,7 +3335,11 @@
              _in-xml-name="choice"
              _in-json-name="choice"
              gi="choice"
-             in-json="SCALAR"/>
+             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"
@@ -3180,6 +3361,9 @@
          <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//part/title"
@@ -3202,28 +3386,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
-      </field>
-   </xsl:template>
-   <xsl:template match="catalog//group//part"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _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"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl: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//part/link/text"
@@ -3246,6 +3411,9 @@
          <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/title"
@@ -3268,6 +3436,9 @@
          <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//group//control/param/link/text"
@@ -3290,6 +3461,9 @@
          <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/param/label"
@@ -3312,6 +3486,9 @@
          <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="catalog//group//control/param/usage"
@@ -3335,6 +3512,12 @@
          <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()">
+               <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"
@@ -3358,6 +3541,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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//group//control/param/constraint/test"
@@ -3397,28 +3586,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
-      </field>
-   </xsl:template>
-   <xsl:template match="catalog//group//control/param/guideline"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _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"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog//group//control/param/select/choice"
@@ -3436,7 +3606,11 @@
              _in-xml-name="choice"
              _in-json-name="choice"
              gi="choice"
-             in-json="SCALAR"/>
+             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"
@@ -3458,6 +3632,9 @@
          <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//part/title"
@@ -3480,28 +3657,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
-      </field>
-   </xsl:template>
-   <xsl:template match="catalog//group//control//part"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _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"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl: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//part/link/text"
@@ -3524,6 +3682,9 @@
          <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"
@@ -3588,6 +3749,9 @@
          <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"
@@ -3611,6 +3775,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -3622,7 +3792,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -3691,6 +3861,9 @@
          <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/citation/link/text"
@@ -3713,6 +3886,9 @@
          <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/rlink"
@@ -3765,6 +3941,15 @@
          </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:math="http://www.w3.org/2005/xpath-functions/math"
diff --git a/json/convert/oscal_complete_xml-to-json-converter.xsl b/json/convert/oscal_complete_xml-to-json-converter.xsl
index 20fb724ca8..b98789f30e 100644
--- a/json/convert/oscal_complete_xml-to-json-converter.xsl
+++ b/json/convert/oscal_complete_xml-to-json-converter.xsl
@@ -87,7 +87,7 @@
                 _metaschema-json-id="/assembly/oscal-catalog/catalog"
                 name="catalog"
                 key="catalog"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_catalog_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_catalog_metaschema.xml"
                 _key-name="oscal-catalog:catalog"
                 _using-root-name="catalog"
                 gi="catalog">
@@ -130,7 +130,7 @@
                 _metaschema-json-id="/assembly/oscal-catalog/catalog/metadata"
                 name="metadata"
                 key="metadata"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:metadata"
                 _step="metadata"
                 _key="metadata"
@@ -206,7 +206,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/revision/prop"
                 _metaschema-json-id="/assembly/oscal-metadata/revision/props"
                 name="property"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:property"
                 _step="prop"
                 _key="props"
@@ -229,7 +229,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/revision/link"
                 _metaschema-json-id="/assembly/oscal-metadata/revision/links"
                 name="link"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:link"
                 _step="link"
                 _key="links"
@@ -250,7 +250,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/role"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/roles"
                 name="role"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:role"
                 _step="role"
                 _key="roles"
@@ -286,7 +286,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/location"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/locations"
                 name="location"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:location"
                 _step="location"
                 _key="locations"
@@ -342,7 +342,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/party"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/parties"
                 name="party"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:party"
                 _step="party"
                 _key="parties"
@@ -420,7 +420,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/responsible-party"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/responsible-parties"
                 name="responsible-party"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:responsible-party"
                 _step="responsible-party"
                 _key="responsible-parties"
@@ -460,7 +460,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-catalog/catalog/param"
                 _metaschema-json-id="/assembly/oscal-catalog/catalog/params"
                 name="parameter"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
                 _key-name="oscal-catalog-common:parameter"
                 _step="param"
                 _key="params"
@@ -519,7 +519,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/constraint"
                 _metaschema-json-id="/assembly/oscal-catalog-common/parameter/constraints"
                 name="parameter-constraint"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
                 _key-name="oscal-catalog-common:parameter-constraint"
                 _step="constraint"
                 _key="constraints"
@@ -544,7 +544,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/guideline"
                 _metaschema-json-id="/assembly/oscal-catalog-common/parameter/guidelines"
                 name="parameter-guideline"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
                 _key-name="oscal-catalog-common:parameter-guideline"
                 _step="guideline"
                 _key="guidelines"
@@ -553,7 +553,29 @@
                 _in-xml-name="guideline"
                 _in-json-name="guidelines"
                 gi="guideline">
-         <xsl:apply-templates select=""/>
+         <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                             group-by="true()">
+            <field in-json="SCALAR"
+                   _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+                   _key="prose"
+                   _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
+                   _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 in-json="string"
+                      as-type="markup-multiline"
+                      _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                      _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE">
+                  <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+               </value>
+            </field>
+         </xsl:for-each-group>
       </assembly>
    </xsl:template>
    <xsl:template match="select"
@@ -563,7 +585,7 @@
                 _metaschema-json-id="/assembly/oscal-catalog-common/parameter/select"
                 name="parameter-selection"
                 key="select"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
                 _key-name="oscal-catalog-common:parameter-selection"
                 _step="select"
                 _key="select"
@@ -591,7 +613,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-catalog/catalog/control"
                 _metaschema-json-id="/assembly/oscal-catalog/catalog/controls"
                 name="control"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_catalog_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_catalog_metaschema.xml"
                 _key-name="oscal-catalog:control"
                 _step="control"
                 _key="controls"
@@ -646,7 +668,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-catalog/control/part"
                 _metaschema-json-id="/assembly/oscal-catalog/control/parts"
                 name="part"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
                 _key-name="oscal-catalog-common:part"
                 _step="part"
                 _key="parts"
@@ -667,7 +689,29 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:apply-templates select=""/>
+         <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                             group-by="true()">
+            <field in-json="SCALAR"
+                   _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+                   _key="prose"
+                   _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
+                   _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 in-json="string"
+                      as-type="markup-multiline"
+                      _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                      _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE">
+                  <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+               </value>
+            </field>
+         </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()">
@@ -690,7 +734,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/terms-and-conditions/part"
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan/terms-and-conditions/parts"
                 name="assessment-part"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:assessment-part"
                 _step="part"
                 _key="parts"
@@ -711,7 +755,29 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:apply-templates select=""/>
+         <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                             group-by="true()">
+            <field in-json="SCALAR"
+                   _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+                   _key="prose"
+                   _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/p ul ol pre table h1 h2 h3 h4 h5 h6"
+                   _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 in-json="string"
+                      as-type="markup-multiline"
+                      _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                      _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE">
+                  <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+               </value>
+            </field>
+         </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()">
@@ -734,7 +800,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-catalog/catalog/group"
                 _metaschema-json-id="/assembly/oscal-catalog/catalog/groups"
                 name="group"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_catalog_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_catalog_metaschema.xml"
                 _key-name="oscal-catalog:group"
                 _step="group"
                 _key="groups"
@@ -796,7 +862,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/custom/group"
                 _metaschema-json-id="/assembly/oscal-profile/custom/groups"
                 name="group"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:group"
                 _step="group"
                 _key="groups"
@@ -859,7 +925,7 @@
                 _metaschema-json-id="/assembly/oscal-catalog/catalog/back-matter"
                 name="back-matter"
                 key="back-matter"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:back-matter"
                 _step="back-matter"
                 _key="back-matter"
@@ -887,7 +953,7 @@
                 _metaschema-json-id="/assembly/oscal-profile/profile"
                 name="profile"
                 key="profile"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:profile"
                 _using-root-name="profile"
                 gi="profile">
@@ -917,7 +983,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/profile/import"
                 _metaschema-json-id="/assembly/oscal-profile/profile/imports"
                 name="import"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:import"
                 _step="import"
                 _key="imports"
@@ -952,7 +1018,7 @@
                 _metaschema-json-id="/assembly/oscal-profile/import/include-all"
                 name="include-all"
                 key="include-all"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:include-all"
                 _step="include-all"
                 _key="include-all"
@@ -973,7 +1039,7 @@
                 _metaschema-json-id="/assembly/oscal-profile/profile/merge"
                 name="merge"
                 key="merge"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:merge"
                 _step="merge"
                 _key="merge"
@@ -998,7 +1064,7 @@
                 _metaschema-json-id="/assembly/oscal-profile/merge/combine"
                 name="combine"
                 key="combine"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:combine"
                 _step="combine"
                 _key="combine"
@@ -1020,7 +1086,7 @@
                 _metaschema-json-id="/assembly/oscal-profile/merge/custom"
                 name="custom"
                 key="custom"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:custom"
                 _step="custom"
                 _key="custom"
@@ -1054,7 +1120,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/group/insert-controls"
                 _metaschema-json-id="/assembly/oscal-profile/group/insert-controls"
                 name="insert-controls"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:insert-controls"
                 _step="insert-controls"
                 _key="insert-controls"
@@ -1088,7 +1154,7 @@
                 _metaschema-json-id="/assembly/oscal-profile/profile/modify"
                 name="modify"
                 key="modify"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:modify"
                 _step="modify"
                 _key="modify"
@@ -1122,7 +1188,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/modify/alter"
                 _metaschema-json-id="/assembly/oscal-profile/modify/alters"
                 name="alter"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:alter"
                 _step="alter"
                 _key="alters"
@@ -1155,7 +1221,7 @@
                 _metaschema-xml-id="/assembly/oscal-profile/alter/remove"
                 _metaschema-json-id="/assembly/oscal-profile/alter/removes"
                 name="remove"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:remove"
                 _step="remove"
                 _key="removes"
@@ -1176,7 +1242,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/alter/add"
                 _metaschema-json-id="/assembly/oscal-profile/alter/adds"
                 name="add"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:add"
                 _step="add"
                 _key="adds"
@@ -1225,7 +1291,7 @@
                 _metaschema-json-id="/assembly/oscal-component-definition/component-definition"
                 name="component-definition"
                 key="component-definition"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:component-definition"
                 _using-root-name="component-definition"
                 gi="component-definition">
@@ -1268,7 +1334,7 @@
                 _metaschema-xml-id="/assembly/oscal-component-definition/component-definition/import-component-definition"
                 _metaschema-json-id="/assembly/oscal-component-definition/component-definition/import-component-definitions"
                 name="import-component-definition"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:import-component-definition"
                 _step="import-component-definition"
                 _key="import-component-definitions"
@@ -1286,7 +1352,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/component-definition/component"
                 _metaschema-json-id="/assembly/oscal-component-definition/component-definition/components"
                 name="defined-component"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:defined-component"
                 _step="component"
                 _key="components"
@@ -1344,7 +1410,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-implementation/component"
                 _metaschema-json-id="/assembly/oscal-ssp/system-implementation/components"
                 name="system-component"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:system-component"
                 _step="component"
                 _key="components"
@@ -1396,7 +1462,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/defined-component/responsible-role"
                 _metaschema-json-id="/assembly/oscal-component-definition/defined-component/responsible-roles"
                 name="responsible-role"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:responsible-role"
                 _step="responsible-role"
                 _key="responsible-roles"
@@ -1436,7 +1502,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/defined-component/protocol"
                 _metaschema-json-id="/assembly/oscal-component-definition/defined-component/protocols"
                 name="protocol"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:protocol"
                 _step="protocol"
                 _key="protocols"
@@ -1464,7 +1530,7 @@
                 _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/port-range"
                 _metaschema-json-id="/assembly/oscal-implementation-common/protocol/port-ranges"
                 name="port-range"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:port-range"
                 _step="port-range"
                 _key="port-ranges"
@@ -1484,7 +1550,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/control-implementation/set-parameter"
                 _metaschema-json-id="/assembly/oscal-component-definition/control-implementation/set-parameters"
                 name="set-parameter"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:set-parameter"
                 _step="set-parameter"
                 _key="set-parameters"
@@ -1510,7 +1576,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/component-definition/capability"
                 _metaschema-json-id="/assembly/oscal-component-definition/component-definition/capabilities"
                 name="capability"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:capability"
                 _step="capability"
                 _key="capabilities"
@@ -1559,7 +1625,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/capability/incorporates-component"
                 _metaschema-json-id="/assembly/oscal-component-definition/capability/incorporates-components"
                 name="incorporates-component"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:incorporates-component"
                 _step="incorporates-component"
                 _key="incorporates-components"
@@ -1579,7 +1645,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-security-plan"
                 name="system-security-plan"
                 key="system-security-plan"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:system-security-plan"
                 _using-root-name="system-security-plan"
                 gi="system-security-plan">
@@ -1605,7 +1671,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-security-plan/import-profile"
                 name="import-profile"
                 key="import-profile"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:import-profile"
                 _step="import-profile"
                 _key="import-profile"
@@ -1628,7 +1694,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-security-plan/system-characteristics"
                 name="system-characteristics"
                 key="system-characteristics"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:system-characteristics"
                 _step="system-characteristics"
                 _key="system-characteristics"
@@ -1689,7 +1755,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/system-information"
                 name="system-information"
                 key="system-information"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:system-information"
                 _step="system-information"
                 _key="system-information"
@@ -1731,7 +1797,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/security-impact-level"
                 name="security-impact-level"
                 key="security-impact-level"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:security-impact-level"
                 _step="security-impact-level"
                 _key="security-impact-level"
@@ -1755,7 +1821,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/authorization-boundary"
                 name="authorization-boundary"
                 key="authorization-boundary"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:authorization-boundary"
                 _step="authorization-boundary"
                 _key="authorization-boundary"
@@ -1798,7 +1864,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ssp/authorization-boundary/diagram"
                 _metaschema-json-id="/assembly/oscal-ssp/authorization-boundary/diagrams"
                 name="diagram"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:diagram"
                 _step="diagram"
                 _key="diagrams"
@@ -1834,7 +1900,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/network-architecture"
                 name="network-architecture"
                 key="network-architecture"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:network-architecture"
                 _step="network-architecture"
                 _key="network-architecture"
@@ -1878,7 +1944,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/data-flow"
                 name="data-flow"
                 key="data-flow"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:data-flow"
                 _step="data-flow"
                 _key="data-flow"
@@ -1922,7 +1988,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-security-plan/system-implementation"
                 name="system-implementation"
                 key="system-implementation"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:system-implementation"
                 _step="system-implementation"
                 _key="system-implementation"
@@ -1985,7 +2051,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-implementation/user"
                 _metaschema-json-id="/assembly/oscal-ssp/system-implementation/users"
                 name="system-user"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:system-user"
                 _step="user"
                 _key="users"
@@ -2035,7 +2101,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/authorized-privilege"
                 _metaschema-json-id="/assembly/oscal-implementation-common/system-user/authorized-privileges"
                 name="authorized-privilege"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:authorized-privilege"
                 _step="authorized-privilege"
                 _key="authorized-privileges"
@@ -2061,7 +2127,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-implementation/inventory-item"
                 _metaschema-json-id="/assembly/oscal-ssp/system-implementation/inventory-items"
                 name="inventory-item"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:inventory-item"
                 _step="inventory-item"
                 _key="inventory-items"
@@ -2109,7 +2175,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ssp/statement/by-component"
                 _metaschema-json-id="/assembly/oscal-ssp/statement/by-components"
                 name="by-component"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:by-component"
                 _step="by-component"
                 _key="by-components"
@@ -2175,7 +2241,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/by-component/implementation-status"
                 name="implementation-status"
                 key="implementation-status"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:implementation-status"
                 _step="implementation-status"
                 _key="implementation-status"
@@ -2198,7 +2264,7 @@
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan"
                 name="assessment-plan"
                 key="assessment-plan"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-plan_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-plan_metaschema.xml"
                 _key-name="oscal-ap:assessment-plan"
                 _using-root-name="assessment-plan"
                 gi="assessment-plan">
@@ -2239,7 +2305,7 @@
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan/import-ssp"
                 name="import-ssp"
                 key="import-ssp"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:import-ssp"
                 _step="import-ssp"
                 _key="import-ssp"
@@ -2261,7 +2327,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/local-definitions/objectives-and-methods"
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan/local-definitions/objectives-and-methods"
                 name="local-objective"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:local-objective"
                 _step="objectives-and-methods"
                 _key="objectives-and-methods"
@@ -2302,7 +2368,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/local-definitions/activity"
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan/local-definitions/activities"
                 name="activity"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:activity"
                 _step="activity"
                 _key="activities"
@@ -2353,7 +2419,7 @@
                 _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps/reviewed-controls"
                 name="reviewed-controls"
                 key="reviewed-controls"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:reviewed-controls"
                 _step="reviewed-controls"
                 _key="reviewed-controls"
@@ -2404,7 +2470,7 @@
                 _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/include-objective"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/include-objectives"
                 name="select-objective-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-objective-by-id"
                 _step="include-objective"
                 _key="include-objectives"
@@ -2423,7 +2489,7 @@
                 _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/exclude-objective"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/exclude-objectives"
                 name="select-objective-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-objective-by-id"
                 _step="exclude-objective"
                 _key="exclude-objectives"
@@ -2442,7 +2508,7 @@
                 _metaschema-json-id="/assembly/oscal-assessment-common/activity/related-controls"
                 name="reviewed-controls"
                 key="related-controls"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:reviewed-controls"
                 _step="related-controls"
                 _key="related-controls"
@@ -2492,7 +2558,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/assessment-subject"
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan/assessment-subjects"
                 name="assessment-subject"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:assessment-subject"
                 _step="assessment-subject"
                 _key="assessment-subjects"
@@ -2541,7 +2607,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-subjects"
                 name="select-subject-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-subject-by-id"
                 _step="include-subject"
                 _key="include-subjects"
@@ -2575,7 +2641,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/exclude-subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/exclude-subjects"
                 name="select-subject-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-subject-by-id"
                 _step="exclude-subject"
                 _key="exclude-subjects"
@@ -2610,7 +2676,7 @@
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan/assessment-assets"
                 name="assessment-assets"
                 key="assessment-assets"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:assessment-assets"
                 _step="assessment-assets"
                 _key="assessment-assets"
@@ -2644,7 +2710,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/task"
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan/tasks"
                 name="task"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:task"
                 _step="task"
                 _key="tasks"
@@ -2716,7 +2782,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/task/associated-activity/subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/task/associated-activities/subjects"
                 name="assessment-subject"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:assessment-subject"
                 _step="subject"
                 _key="subjects"
@@ -2766,7 +2832,7 @@
                 _metaschema-json-id="/assembly/oscal-ar/assessment-results"
                 name="assessment-results"
                 key="assessment-results"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-results_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-results_metaschema.xml"
                 _key-name="oscal-ar:assessment-results"
                 _using-root-name="assessment-results"
                 gi="assessment-results">
@@ -2797,7 +2863,7 @@
                 _metaschema-json-id="/assembly/oscal-ar/assessment-results/import-ap"
                 name="import-ap"
                 key="import-ap"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-results_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-results_metaschema.xml"
                 _key-name="oscal-ar:import-ap"
                 _step="import-ap"
                 _key="import-ap"
@@ -2819,7 +2885,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ar/assessment-results/result"
                 _metaschema-json-id="/assembly/oscal-ar/assessment-results/results"
                 name="result"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-results_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-results_metaschema.xml"
                 _key-name="oscal-ar:result"
                 _step="result"
                 _key="results"
@@ -2887,7 +2953,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ar/result/local-definitions/assessment-task"
                 _metaschema-json-id="/assembly/oscal-ar/result/local-definitions/tasks"
                 name="task"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:task"
                 _step="assessment-task"
                 _key="tasks"
@@ -2960,7 +3026,7 @@
                 _metaschema-xml-id="/assembly/oscal-ar/result/assessment-log/entry/logged-by"
                 _metaschema-json-id="/assembly/oscal-ar/result/assessment-log/entries/logged-by"
                 name="logged-by"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:logged-by"
                 _step="logged-by"
                 _key="logged-by"
@@ -2979,7 +3045,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ar/result/assessment-log/entry/related-task"
                 _metaschema-json-id="/assembly/oscal-ar/result/assessment-log/entries/related-tasks"
                 name="related-task"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:related-task"
                 _step="related-task"
                 _key="related-tasks"
@@ -3027,7 +3093,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ar/result/observation"
                 _metaschema-json-id="/assembly/oscal-ar/result/observations"
                 name="observation"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:observation"
                 _step="observation"
                 _key="observations"
@@ -3099,7 +3165,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/observation/origin"
                 _metaschema-json-id="/assembly/oscal-assessment-common/observation/origins"
                 name="origin"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:origin"
                 _step="origin"
                 _key="origins"
@@ -3133,7 +3199,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/origin/actor"
                 _metaschema-json-id="/assembly/oscal-assessment-common/origin/actors"
                 name="origin-actor"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:origin-actor"
                 _step="actor"
                 _key="actors"
@@ -3167,7 +3233,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ar/result/risk"
                 _metaschema-json-id="/assembly/oscal-ar/result/risks"
                 name="risk"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:risk"
                 _step="risk"
                 _key="risks"
@@ -3247,7 +3313,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/risk/characterization"
                 _metaschema-json-id="/assembly/oscal-assessment-common/risk/characterizations"
                 name="characterization"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:characterization"
                 _step="characterization"
                 _key="characterizations"
@@ -3286,7 +3352,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ar/result/finding"
                 _metaschema-json-id="/assembly/oscal-ar/result/findings"
                 name="finding"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-results_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-results_metaschema.xml"
                 _key-name="oscal-ar:finding"
                 _step="finding"
                 _key="findings"
@@ -3345,7 +3411,7 @@
                 _metaschema-json-id="/assembly/oscal-ar/finding/target"
                 name="finding-target"
                 key="target"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:finding-target"
                 _step="target"
                 _key="target"
@@ -3376,7 +3442,6 @@
             </group>
          </xsl:for-each-group>
          <xsl:apply-templates select="status"/>
-         <xsl:apply-templates select="reason"/>
          <xsl:apply-templates select="implementation-status"/>
          <xsl:apply-templates select="remarks"/>
       </assembly>
@@ -3388,7 +3453,7 @@
                 _metaschema-json-id="/assembly/oscal-poam/plan-of-action-and-milestones"
                 name="plan-of-action-and-milestones"
                 key="plan-of-action-and-milestones"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_poam_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_poam_metaschema.xml"
                 _key-name="oscal-poam:plan-of-action-and-milestones"
                 _using-root-name="plan-of-action-and-milestones"
                 gi="plan-of-action-and-milestones">
@@ -3434,7 +3499,7 @@
                 _metaschema-json-id="/assembly/oscal-poam/plan-of-action-and-milestones/local-definitions"
                 name="local-definitions"
                 key="local-definitions"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_poam_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_poam_metaschema.xml"
                 _key-name="oscal-poam:local-definitions"
                 _step="local-definitions"
                 _key="local-definitions"
@@ -3469,7 +3534,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-poam/plan-of-action-and-milestones/poam-item"
                 _metaschema-json-id="/assembly/oscal-poam/plan-of-action-and-milestones/poam-items"
                 name="poam-item"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_poam_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_poam_metaschema.xml"
                 _key-name="oscal-poam:poam-item"
                 _step="poam-item"
                 _key="poam-items"
@@ -3529,7 +3594,7 @@
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:remarks"
              _step="remarks"
              _key="remarks"
@@ -3542,6 +3607,12 @@
          <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"
@@ -3552,7 +3623,7 @@
              collapsible="no"
              as-type="uuid"
              name="location-uuid"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:location-uuid"
              _step="location-uuid"
              _key="location-uuids"
@@ -3561,7 +3632,11 @@
              _in-xml-name="location-uuid"
              _in-json-name="location-uuids"
              gi="location-uuid"
-             in-json="SCALAR"/>
+             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">
@@ -3571,7 +3646,7 @@
              collapsible="no"
              as-type="uuid"
              name="party-uuid"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:party-uuid"
              _step="party-uuid"
              _key="party-uuids"
@@ -3580,7 +3655,11 @@
              _in-xml-name="party-uuid"
              _in-json-name="party-uuids"
              gi="party-uuid"
-             in-json="SCALAR"/>
+             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">
@@ -3590,7 +3669,7 @@
              collapsible="no"
              as-type="string"
              name="parameter-value"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
              _key-name="oscal-catalog-common:parameter-value"
              _step="value"
              _key="values"
@@ -3599,7 +3678,11 @@
              _in-xml-name="value"
              _in-json-name="values"
              gi="value"
-             in-json="SCALAR"/>
+             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">
@@ -3609,7 +3692,7 @@
              collapsible="no"
              as-type="string"
              name="hash"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:hash"
              _step="hash"
              _key="hashes"
@@ -3633,7 +3716,7 @@
              as-type="boolean"
              name="as-is"
              key="as-is"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
              _key-name="oscal-profile:as-is"
              _step="as-is"
              _key="as-is"
@@ -3646,6 +3729,9 @@
          <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="system-id"
@@ -3656,7 +3742,7 @@
              collapsible="no"
              as-type="string"
              name="system-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
              _key-name="oscal-implementation-common:system-id"
              _step="system-id"
              _key="system-ids"
@@ -3682,7 +3768,7 @@
              collapsible="no"
              as-type="token"
              name="role-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:role-id"
              _step="role-id"
              _key="role-ids"
@@ -3691,7 +3777,11 @@
              _in-xml-name="role-id"
              _in-json-name="role-ids"
              gi="role-id"
-             in-json="SCALAR"/>
+             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">
@@ -3701,7 +3791,7 @@
              collapsible="no"
              as-type="string"
              name="function-performed"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
              _key-name="oscal-implementation-common:function-performed"
              _step="function-performed"
              _key="functions-performed"
@@ -3710,7 +3800,11 @@
              _in-xml-name="function-performed"
              _in-json-name="functions-performed"
              gi="function-performed"
-             in-json="SCALAR"/>
+             in-json="SCALAR">
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
    </xsl:template>
    <xsl:template match="threat-id"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
@@ -3720,7 +3814,7 @@
              collapsible="no"
              as-type="uri"
              name="threat-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
              _key-name="oscal-assessment-common:threat-id"
              _step="threat-id"
              _key="threat-ids"
@@ -3745,7 +3839,7 @@
              as-type="token"
              name="risk-status"
              key="status-change"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
              _key-name="oscal-assessment-common:risk-status"
              _step="status-change"
              _key="status-change"
@@ -3758,6 +3852,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status-change</xsl:attribute>
          </xsl:if>
+         <value as-type="token" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog/@uuid"
@@ -3904,7 +4001,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/link/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -3976,7 +4073,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/address/type"
             name="location-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:location-type"
             _step="type"
             _key="type"
@@ -4117,7 +4214,7 @@
             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/depends-on"
             name="depends-on"
             key="depends-on"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
             _key-name="oscal-catalog-common:depends-on"
             _step="depends-on"
             _key="depends-on"
@@ -4326,7 +4423,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -4381,7 +4478,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -4435,7 +4532,7 @@
             _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/with-child-controls"
             name="with-child-controls"
             key="with-child-controls"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
             _key-name="oscal-profile:with-child-controls"
             _step="with-child-controls"
             _key="with-child-controls"
@@ -4455,7 +4552,7 @@
             _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/matching/pattern"
             name="pattern"
             key="pattern"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
             _key-name="oscal-profile:pattern"
             _step="pattern"
             _key="pattern"
@@ -4475,7 +4572,7 @@
             _metaschema-json-id="/assembly/oscal-profile/combine/method"
             name="method"
             key="method"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
             _key-name="oscal-profile:method"
             _step="method"
             _key="method"
@@ -4582,7 +4679,7 @@
             _metaschema-json-id="/assembly/oscal-profile/modify/set-parameters/depends-on"
             name="depends-on"
             key="depends-on"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
             _key-name="oscal-catalog-common:depends-on"
             _step="depends-on"
             _key="depends-on"
@@ -4602,7 +4699,7 @@
             _metaschema-json-id="/assembly/oscal-profile/alter/control-id"
             name="control-id"
             key="control-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
             _key-name="oscal-catalog-common:control-id"
             _step="control-id"
             _key="control-id"
@@ -4792,7 +4889,7 @@
             _metaschema-json-id="/assembly/oscal-component-definition/defined-component/type"
             name="defined-component-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
             _key-name="oscal-component-definition:defined-component-type"
             _step="type"
             _key="type"
@@ -4932,7 +5029,7 @@
             _metaschema-json-id="/assembly/oscal-component-definition/control-implementation/source"
             name="source"
             key="source"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
             _key-name="oscal-implementation-common:source"
             _step="source"
             _key="source"
@@ -4952,7 +5049,7 @@
             _metaschema-json-id="/assembly/oscal-implementation-common/set-parameter/param-id"
             name="param-id"
             key="param-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
             _key-name="oscal-implementation-common:param-id"
             _step="param-id"
             _key="param-id"
@@ -4990,7 +5087,7 @@
             _metaschema-json-id="/assembly/oscal-component-definition/implemented-requirement/control-id"
             name="control-id"
             key="control-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
             _key-name="oscal-catalog-common:control-id"
             _step="control-id"
             _key="control-id"
@@ -5010,7 +5107,7 @@
             _metaschema-json-id="/assembly/oscal-component-definition/statement/statement-id"
             name="statement-id"
             key="statement-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
             _key-name="oscal-implementation-common:statement-id"
             _step="statement-id"
             _key="statement-id"
@@ -5273,7 +5370,7 @@
             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/type"
             name="system-component-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
             _key-name="oscal-implementation-common:system-component-type"
             _step="type"
             _key="type"
@@ -5364,7 +5461,7 @@
             _metaschema-json-id="/assembly/oscal-ssp/implemented-requirement/control-id"
             name="control-id"
             key="control-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
             _key-name="oscal-catalog-common:control-id"
             _step="control-id"
             _key="control-id"
@@ -5384,7 +5481,7 @@
             _metaschema-json-id="/assembly/oscal-ssp/statement/statement-id"
             name="statement-id"
             key="statement-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
             _key-name="oscal-implementation-common:statement-id"
             _step="statement-id"
             _key="statement-id"
@@ -5509,7 +5606,7 @@
             _metaschema-json-id="/assembly/oscal-ssp/by-component/export/responsibilities/provided-uuid"
             name="provided-uuid"
             key="provided-uuid"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
             _key-name="oscal-ssp:provided-uuid"
             _step="provided-uuid"
             _key="provided-uuid"
@@ -5547,7 +5644,7 @@
             _metaschema-json-id="/assembly/oscal-ssp/by-component/inherited/provided-uuid"
             name="provided-uuid"
             key="provided-uuid"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
             _key-name="oscal-ssp:provided-uuid"
             _step="provided-uuid"
             _key="provided-uuid"
@@ -5585,7 +5682,7 @@
             _metaschema-json-id="/assembly/oscal-ssp/by-component/satisfied/responsibility-uuid"
             name="responsibility-uuid"
             key="responsibility-uuid"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
             _key-name="oscal-ssp:responsibility-uuid"
             _step="responsibility-uuid"
             _key="responsibility-uuid"
@@ -5639,7 +5736,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/local-objective/control-id"
             name="control-id"
             key="control-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
             _key-name="oscal-catalog-common:control-id"
             _step="control-id"
             _key="control-id"
@@ -5694,7 +5791,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/control-id"
             name="control-id"
             key="control-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
             _key-name="oscal-catalog-common:control-id"
             _step="control-id"
             _key="control-id"
@@ -5714,7 +5811,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/select-objective-by-id/objective-id"
             name="objective-id"
             key="objective-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
             _key-name="oscal-assessment-common:objective-id"
             _step="objective-id"
             _key="objective-id"
@@ -5819,7 +5916,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/select-subject-by-id/subject-uuid"
             name="subject-uuid"
             key="subject-uuid"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
             _key-name="oscal-assessment-common:subject-uuid"
             _step="subject-uuid"
             _key="subject-uuid"
@@ -5839,7 +5936,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/select-subject-by-id/type"
             name="subject-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
             _key-name="oscal-assessment-common:subject-type"
             _step="type"
             _key="type"
@@ -6261,7 +6358,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/subject-reference/subject-uuid"
             name="subject-uuid"
             key="subject-uuid"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
             _key-name="oscal-assessment-common:subject-uuid"
             _step="subject-uuid"
             _key="subject-uuid"
@@ -6281,7 +6378,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/subject-reference/type"
             name="subject-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
             _key-name="oscal-assessment-common:subject-type"
             _step="type"
             _key="type"
@@ -6611,6 +6708,42 @@
          <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">
+      <flag in-json="string"
+            as-type="token"
+            _step="state"
+            _key="state"
+            _metaschema-xml-id="/assembly/oscal-assessment-common/finding-target/status/state"
+            _metaschema-json-id="/assembly/oscal-assessment-common/finding-target/status/state"
+            name="state"
+            key="state"
+            _using-name="state"
+            _in-xml-name="state"
+            _in-json-name="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">
+      <flag in-json="string"
+            as-type="token"
+            _step="reason"
+            _key="reason"
+            _metaschema-xml-id="/assembly/oscal-assessment-common/finding-target/status/reason"
+            _metaschema-json-id="/assembly/oscal-assessment-common/finding-target/status/reason"
+            name="reason"
+            key="reason"
+            _using-name="reason"
+            _in-xml-name="reason"
+            _in-json-name="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">
@@ -6737,6 +6870,9 @@
          <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/metadata/published"
@@ -6749,7 +6885,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -6762,6 +6898,9 @@
          <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="catalog/metadata/last-modified"
@@ -6774,7 +6913,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -6787,6 +6926,9 @@
          <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="catalog/metadata/version"
@@ -6799,7 +6941,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -6812,6 +6954,9 @@
          <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="catalog/metadata/oscal-version"
@@ -6824,7 +6969,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -6837,6 +6982,9 @@
          <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="catalog/metadata/revisions/revision"
@@ -6846,7 +6994,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/revisions/revision"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/revisions"
                 name="revision"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:revision"
                 _step="revisions/revision"
                 _key="revisions"
@@ -6886,7 +7034,7 @@
              group-json="ARRAY"
              name="revision"
              key="revisions"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:revision"
              _key-ref="oscal-metadata:revision">
          <xsl:if test="$with-key">
@@ -6915,6 +7063,9 @@
          <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/metadata/revisions/revision/published"
@@ -6927,7 +7078,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -6940,6 +7091,9 @@
          <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="catalog/metadata/revisions/revision/last-modified"
@@ -6952,7 +7106,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -6965,6 +7119,9 @@
          <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="catalog/metadata/revisions/revision/version"
@@ -6977,7 +7134,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -6990,6 +7147,9 @@
          <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="catalog/metadata/revisions/revision/oscal-version"
@@ -7002,7 +7162,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -7015,6 +7175,9 @@
          <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="catalog/metadata/revisions/revision/link/text"
@@ -7037,6 +7200,9 @@
          <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/document-id"
@@ -7048,7 +7214,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -7083,6 +7249,9 @@
          <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/role/title"
@@ -7105,6 +7274,9 @@
          <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/metadata/role/short-name"
@@ -7127,6 +7299,9 @@
          <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="catalog/metadata/role/description"
@@ -7150,6 +7325,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/metadata/role/link/text"
@@ -7172,6 +7353,9 @@
          <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/location/title"
@@ -7194,6 +7378,9 @@
          <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/metadata/location/address"
@@ -7204,7 +7391,7 @@
                 _metaschema-json-id="/assembly/oscal-metadata/location/address"
                 name="address"
                 key="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="address"
@@ -7239,7 +7426,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -7248,7 +7435,11 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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"
@@ -7270,6 +7461,9 @@
          <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="catalog/metadata/location/address/state"
@@ -7292,6 +7486,9 @@
          <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="catalog/metadata/location/address/postal-code"
@@ -7314,6 +7511,9 @@
          <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="catalog/metadata/location/address/country"
@@ -7336,6 +7536,9 @@
          <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="catalog/metadata/location/email-address"
@@ -7347,7 +7550,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -7356,7 +7559,11 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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"
@@ -7367,7 +7574,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -7397,7 +7604,11 @@
              _in-xml-name="url"
              _in-json-name="urls"
              gi="url"
-             in-json="SCALAR"/>
+             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"
@@ -7419,6 +7630,9 @@
          <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/party/name"
@@ -7441,6 +7655,9 @@
          <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="catalog/metadata/party/short-name"
@@ -7463,6 +7680,9 @@
          <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="catalog/metadata/party/external-id"
@@ -7506,6 +7726,9 @@
          <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/party/email-address"
@@ -7517,7 +7740,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -7526,7 +7749,11 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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"
@@ -7537,7 +7764,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -7559,7 +7786,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/party/address"
                 _metaschema-json-id="/assembly/oscal-metadata/party/addresses"
                 name="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="addresses"
@@ -7591,7 +7818,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -7600,7 +7827,11 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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"
@@ -7622,6 +7853,9 @@
          <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="catalog/metadata/party/address/state"
@@ -7644,6 +7878,9 @@
          <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="catalog/metadata/party/address/postal-code"
@@ -7666,6 +7903,9 @@
          <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="catalog/metadata/party/address/country"
@@ -7688,6 +7928,9 @@
          <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="catalog/metadata/party/member-of-organization"
@@ -7705,7 +7948,11 @@
              _in-xml-name="member-of-organization"
              _in-json-name="member-of-organizations"
              gi="member-of-organization"
-             in-json="SCALAR"/>
+             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"
@@ -7727,6 +7974,9 @@
          <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/param/link/text"
@@ -7749,6 +7999,9 @@
          <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/param/label"
@@ -7771,6 +8024,9 @@
          <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="catalog/param/usage"
@@ -7794,6 +8050,12 @@
          <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()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
+         </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog/param/constraint/description"
@@ -7817,6 +8079,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/param/constraint/test"
@@ -7856,28 +8124,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
-      </field>
-   </xsl:template>
-   <xsl:template match="catalog/param/guideline"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _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"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog/param/select/choice"
@@ -7895,7 +8144,11 @@
              _in-xml-name="choice"
              _in-json-name="choice"
              gi="choice"
-             in-json="SCALAR"/>
+             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"
@@ -7917,6 +8170,9 @@
          <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//control/param/link/text"
@@ -7939,6 +8195,9 @@
          <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/param/label"
@@ -7961,6 +8220,9 @@
          <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="catalog//control/param/usage"
@@ -7984,6 +8246,12 @@
          <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()">
+               <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"
@@ -8007,6 +8275,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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//control/param/constraint/test"
@@ -8046,28 +8320,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
-      </field>
-   </xsl:template>
-   <xsl:template match="catalog//control/param/guideline"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _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"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog//control/param/select/choice"
@@ -8085,7 +8340,11 @@
              _in-xml-name="choice"
              _in-json-name="choice"
              gi="choice"
-             in-json="SCALAR"/>
+             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"
@@ -8107,6 +8366,9 @@
          <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//part/title"
@@ -8129,28 +8391,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
-      </field>
-   </xsl:template>
-   <xsl:template match="catalog//control//part"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _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"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl: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//part/link/text"
@@ -8173,6 +8416,9 @@
          <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/title"
@@ -8195,6 +8441,9 @@
          <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//group/param/link/text"
@@ -8217,6 +8466,9 @@
          <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/param/label"
@@ -8239,6 +8491,9 @@
          <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="catalog//group/param/usage"
@@ -8262,6 +8517,12 @@
          <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()">
+               <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"
@@ -8285,6 +8546,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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//group/param/constraint/test"
@@ -8324,28 +8591,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
-      </field>
-   </xsl:template>
-   <xsl:template match="catalog//group/param/guideline"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _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"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog//group/param/select/choice"
@@ -8363,7 +8611,11 @@
              _in-xml-name="choice"
              _in-json-name="choice"
              gi="choice"
-             in-json="SCALAR"/>
+             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"
@@ -8385,6 +8637,9 @@
          <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//part/title"
@@ -8407,28 +8662,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
-      </field>
-   </xsl:template>
-   <xsl:template match="catalog//group//part"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _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"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl: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//part/link/text"
@@ -8451,6 +8687,9 @@
          <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/title"
@@ -8473,6 +8712,9 @@
          <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//group//control/param/link/text"
@@ -8495,6 +8737,9 @@
          <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/param/label"
@@ -8517,6 +8762,9 @@
          <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="catalog//group//control/param/usage"
@@ -8540,6 +8788,12 @@
          <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()">
+               <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"
@@ -8563,6 +8817,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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//group//control/param/constraint/test"
@@ -8602,28 +8862,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
-      </field>
-   </xsl:template>
-   <xsl:template match="catalog//group//control/param/guideline"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _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"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog//group//control/param/select/choice"
@@ -8641,7 +8882,11 @@
              _in-xml-name="choice"
              _in-json-name="choice"
              gi="choice"
-             in-json="SCALAR"/>
+             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"
@@ -8663,6 +8908,9 @@
          <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//part/title"
@@ -8685,28 +8933,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
-      </field>
-   </xsl:template>
-   <xsl:template match="catalog//group//control//part"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _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"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl: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//part/link/text"
@@ -8729,6 +8958,9 @@
          <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"
@@ -8793,6 +9025,9 @@
          <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"
@@ -8816,6 +9051,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -8827,7 +9068,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -8896,6 +9137,9 @@
          <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/citation/link/text"
@@ -8918,6 +9162,9 @@
          <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/rlink"
@@ -8990,6 +9237,9 @@
          <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"
@@ -9002,7 +9252,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -9015,6 +9265,9 @@
          <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"
@@ -9027,7 +9280,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -9040,6 +9293,9 @@
          <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"
@@ -9052,7 +9308,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -9065,6 +9321,9 @@
          <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"
@@ -9077,7 +9336,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -9090,6 +9349,9 @@
          <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"
@@ -9099,7 +9361,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/revisions/revision"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/revisions"
                 name="revision"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:revision"
                 _step="revisions/revision"
                 _key="revisions"
@@ -9139,7 +9401,7 @@
              group-json="ARRAY"
              name="revision"
              key="revisions"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:revision"
              _key-ref="oscal-metadata:revision">
          <xsl:if test="$with-key">
@@ -9168,6 +9430,9 @@
          <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"
@@ -9180,7 +9445,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -9193,6 +9458,9 @@
          <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"
@@ -9205,7 +9473,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -9218,6 +9486,9 @@
          <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"
@@ -9230,7 +9501,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -9243,6 +9514,9 @@
          <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"
@@ -9255,7 +9529,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -9268,6 +9542,9 @@
          <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"
@@ -9290,6 +9567,9 @@
          <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"
@@ -9301,7 +9581,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -9336,6 +9616,9 @@
          <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/title"
@@ -9358,6 +9641,9 @@
          <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"
@@ -9380,6 +9666,9 @@
          <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"
@@ -9403,6 +9692,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -9425,6 +9720,9 @@
          <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/title"
@@ -9447,6 +9745,9 @@
          <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"
@@ -9457,7 +9758,7 @@
                 _metaschema-json-id="/assembly/oscal-metadata/location/address"
                 name="address"
                 key="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="address"
@@ -9492,7 +9793,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -9501,7 +9802,11 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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"
@@ -9523,6 +9828,9 @@
          <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"
@@ -9545,6 +9853,9 @@
          <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"
@@ -9567,6 +9878,9 @@
          <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"
@@ -9589,6 +9903,9 @@
          <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"
@@ -9600,7 +9917,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -9609,7 +9926,11 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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"
@@ -9620,7 +9941,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -9650,7 +9971,11 @@
              _in-xml-name="url"
              _in-json-name="urls"
              gi="url"
-             in-json="SCALAR"/>
+             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"
@@ -9672,6 +9997,9 @@
          <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/name"
@@ -9694,6 +10022,9 @@
          <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"
@@ -9716,6 +10047,9 @@
          <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"
@@ -9759,6 +10093,9 @@
          <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"
@@ -9770,7 +10107,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -9779,7 +10116,11 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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"
@@ -9790,7 +10131,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -9812,7 +10153,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/party/address"
                 _metaschema-json-id="/assembly/oscal-metadata/party/addresses"
                 name="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="addresses"
@@ -9844,7 +10185,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -9853,7 +10194,11 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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"
@@ -9875,6 +10220,9 @@
          <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"
@@ -9897,6 +10245,9 @@
          <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"
@@ -9919,6 +10270,9 @@
          <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"
@@ -9941,6 +10295,9 @@
          <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"
@@ -9958,7 +10315,11 @@
              _in-xml-name="member-of-organization"
              _in-json-name="member-of-organizations"
              gi="member-of-organization"
-             in-json="SCALAR"/>
+             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"
@@ -9980,6 +10341,9 @@
          <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"
@@ -9989,7 +10353,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/import/include-controls"
                 _metaschema-json-id="/assembly/oscal-profile/import/include-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:select-control-by-id"
                 _step="include-controls"
                 _key="include-controls"
@@ -10030,7 +10394,11 @@
              _in-xml-name="with-id"
              _in-json-name="with-ids"
              gi="with-id"
-             in-json="SCALAR"/>
+             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"
@@ -10056,7 +10424,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/import/exclude-controls"
                 _metaschema-json-id="/assembly/oscal-profile/import/exclude-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:select-control-by-id"
                 _step="exclude-controls"
                 _key="exclude-controls"
@@ -10097,7 +10465,11 @@
              _in-xml-name="with-id"
              _in-json-name="with-ids"
              gi="with-id"
-             in-json="SCALAR"/>
+             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"
@@ -10136,6 +10508,9 @@
          <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"
@@ -10158,6 +10533,9 @@
          <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"
@@ -10180,6 +10558,9 @@
          <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"
@@ -10203,6 +10584,12 @@
          <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()">
+               <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"
@@ -10226,6 +10613,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/merge/custom//group/param/constraint/test"
@@ -10265,28 +10658,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
-      </field>
-   </xsl:template>
-   <xsl:template match="profile/merge/custom//group/param/guideline"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _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"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
       </field>
    </xsl:template>
    <xsl:template match="profile/merge/custom//group/param/select/choice"
@@ -10304,7 +10678,11 @@
              _in-xml-name="choice"
              _in-json-name="choice"
              gi="choice"
-             in-json="SCALAR"/>
+             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"
@@ -10326,6 +10704,9 @@
          <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//part/title"
@@ -10348,28 +10729,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
-      </field>
-   </xsl:template>
-   <xsl:template match="profile/merge/custom//group//part"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _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"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl: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//part/link/text"
@@ -10392,6 +10754,9 @@
          <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/insert-controls/include-controls"
@@ -10401,7 +10766,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/insert-controls/include-controls"
                 _metaschema-json-id="/assembly/oscal-profile/insert-controls/include-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:select-control-by-id"
                 _step="include-controls"
                 _key="include-controls"
@@ -10442,7 +10807,11 @@
              _in-xml-name="with-id"
              _in-json-name="with-ids"
              gi="with-id"
-             in-json="SCALAR"/>
+             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"
@@ -10468,7 +10837,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/insert-controls/exclude-controls"
                 _metaschema-json-id="/assembly/oscal-profile/insert-controls/exclude-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:select-control-by-id"
                 _step="exclude-controls"
                 _key="exclude-controls"
@@ -10509,7 +10878,11 @@
              _in-xml-name="with-id"
              _in-json-name="with-ids"
              gi="with-id"
-             in-json="SCALAR"/>
+             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"
@@ -10535,7 +10908,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/insert-controls/include-controls"
                 _metaschema-json-id="/assembly/oscal-profile/insert-controls/include-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:select-control-by-id"
                 _step="include-controls"
                 _key="include-controls"
@@ -10576,7 +10949,11 @@
              _in-xml-name="with-id"
              _in-json-name="with-ids"
              gi="with-id"
-             in-json="SCALAR"/>
+             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"
@@ -10602,7 +10979,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/insert-controls/exclude-controls"
                 _metaschema-json-id="/assembly/oscal-profile/insert-controls/exclude-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:select-control-by-id"
                 _step="exclude-controls"
                 _key="exclude-controls"
@@ -10643,7 +11020,11 @@
              _in-xml-name="with-id"
              _in-json-name="with-ids"
              gi="with-id"
-             in-json="SCALAR"/>
+             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"
@@ -10738,6 +11119,9 @@
          <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/modify/set-parameter/label"
@@ -10760,6 +11144,9 @@
          <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/modify/set-parameter/usage"
@@ -10783,6 +11170,12 @@
          <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()">
+               <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"
@@ -10806,6 +11199,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/modify/set-parameter/constraint/test"
@@ -10845,28 +11244,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
-      </field>
-   </xsl:template>
-   <xsl:template match="profile/modify/set-parameter/guideline"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _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"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
       </field>
    </xsl:template>
    <xsl:template match="profile/modify/set-parameter/select/choice"
@@ -10884,7 +11264,11 @@
              _in-xml-name="choice"
              _in-json-name="choice"
              gi="choice"
-             in-json="SCALAR"/>
+             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/title"
                  priority="8"
@@ -10906,6 +11290,9 @@
          <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/modify/alter/add/param/link/text"
@@ -10928,6 +11315,9 @@
          <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/modify/alter/add/param/label"
@@ -10950,6 +11340,9 @@
          <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/modify/alter/add/param/usage"
@@ -10973,6 +11366,12 @@
          <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()">
+               <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"
@@ -10996,6 +11395,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/modify/alter/add/param/constraint/test"
@@ -11035,28 +11440,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
-      </field>
-   </xsl:template>
-   <xsl:template match="profile/modify/alter/add/param/guideline"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _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"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
       </field>
    </xsl:template>
    <xsl:template match="profile/modify/alter/add/param/select/choice"
@@ -11074,7 +11460,11 @@
              _in-xml-name="choice"
              _in-json-name="choice"
              gi="choice"
-             in-json="SCALAR"/>
+             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"
@@ -11096,6 +11486,9 @@
          <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/modify/alter/add//part/title"
@@ -11118,28 +11511,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
-      </field>
-   </xsl:template>
-   <xsl:template match="profile/modify/alter/add//part"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _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"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl: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/modify/alter/add//part/link/text"
@@ -11162,6 +11536,9 @@
          <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/back-matter/resource"
@@ -11226,6 +11603,9 @@
          <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/back-matter/resource/description"
@@ -11249,6 +11629,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/back-matter/resource/document-id"
@@ -11260,7 +11646,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -11329,6 +11715,9 @@
          <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/back-matter/resource/citation/link/text"
@@ -11351,6 +11740,9 @@
          <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/back-matter/resource/rlink"
@@ -11423,6 +11815,9 @@
          <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="component-definition/metadata/published"
@@ -11435,7 +11830,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -11448,6 +11843,9 @@
          <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="component-definition/metadata/last-modified"
@@ -11460,7 +11858,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -11473,6 +11871,9 @@
          <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="component-definition/metadata/version"
@@ -11485,7 +11886,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -11498,6 +11899,9 @@
          <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="component-definition/metadata/oscal-version"
@@ -11510,7 +11914,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -11523,6 +11927,9 @@
          <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="component-definition/metadata/revisions/revision"
@@ -11532,7 +11939,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/revisions/revision"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/revisions"
                 name="revision"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:revision"
                 _step="revisions/revision"
                 _key="revisions"
@@ -11572,7 +11979,7 @@
              group-json="ARRAY"
              name="revision"
              key="revisions"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:revision"
              _key-ref="oscal-metadata:revision">
          <xsl:if test="$with-key">
@@ -11601,6 +12008,9 @@
          <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="component-definition/metadata/revisions/revision/published"
@@ -11613,7 +12023,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -11626,6 +12036,9 @@
          <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="component-definition/metadata/revisions/revision/last-modified"
@@ -11638,7 +12051,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -11651,6 +12064,9 @@
          <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="component-definition/metadata/revisions/revision/version"
@@ -11663,7 +12079,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -11676,6 +12092,9 @@
          <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="component-definition/metadata/revisions/revision/oscal-version"
@@ -11688,7 +12107,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -11701,6 +12120,9 @@
          <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="component-definition/metadata/revisions/revision/link/text"
@@ -11723,6 +12145,9 @@
          <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/document-id"
@@ -11734,7 +12159,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -11769,6 +12194,9 @@
          <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/role/title"
@@ -11791,6 +12219,9 @@
          <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="component-definition/metadata/role/short-name"
@@ -11813,6 +12244,9 @@
          <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="component-definition/metadata/role/description"
@@ -11836,6 +12270,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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="component-definition/metadata/role/link/text"
@@ -11858,6 +12298,9 @@
          <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/location/title"
@@ -11880,6 +12323,9 @@
          <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="component-definition/metadata/location/address"
@@ -11890,7 +12336,7 @@
                 _metaschema-json-id="/assembly/oscal-metadata/location/address"
                 name="address"
                 key="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="address"
@@ -11925,7 +12371,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -11934,7 +12380,11 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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"
@@ -11956,6 +12406,9 @@
          <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="component-definition/metadata/location/address/state"
@@ -11978,6 +12431,9 @@
          <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="component-definition/metadata/location/address/postal-code"
@@ -12000,6 +12456,9 @@
          <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="component-definition/metadata/location/address/country"
@@ -12022,6 +12481,9 @@
          <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="component-definition/metadata/location/email-address"
@@ -12033,7 +12495,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -12042,7 +12504,11 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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"
@@ -12053,7 +12519,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -12083,7 +12549,11 @@
              _in-xml-name="url"
              _in-json-name="urls"
              gi="url"
-             in-json="SCALAR"/>
+             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"
@@ -12105,6 +12575,9 @@
          <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/party/name"
@@ -12127,6 +12600,9 @@
          <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="component-definition/metadata/party/short-name"
@@ -12149,6 +12625,9 @@
          <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="component-definition/metadata/party/external-id"
@@ -12192,6 +12671,9 @@
          <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/party/email-address"
@@ -12203,7 +12685,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -12212,7 +12694,11 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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"
@@ -12223,7 +12709,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -12245,7 +12731,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/party/address"
                 _metaschema-json-id="/assembly/oscal-metadata/party/addresses"
                 name="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="addresses"
@@ -12277,7 +12763,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -12286,7 +12772,11 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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"
@@ -12308,6 +12798,9 @@
          <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="component-definition/metadata/party/address/state"
@@ -12330,6 +12823,9 @@
          <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="component-definition/metadata/party/address/postal-code"
@@ -12352,6 +12848,9 @@
          <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="component-definition/metadata/party/address/country"
@@ -12374,6 +12873,9 @@
          <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="component-definition/metadata/party/member-of-organization"
@@ -12391,7 +12893,11 @@
              _in-xml-name="member-of-organization"
              _in-json-name="member-of-organizations"
              gi="member-of-organization"
-             in-json="SCALAR"/>
+             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"
@@ -12413,6 +12919,9 @@
          <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/component/title"
@@ -12435,6 +12944,9 @@
          <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="component-definition/component/description"
@@ -12458,6 +12970,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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="component-definition/component/purpose"
@@ -12480,6 +12998,9 @@
          <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="component-definition/component/link/text"
@@ -12502,6 +13023,9 @@
          <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/component/responsible-role/link/text"
@@ -12524,6 +13048,9 @@
          <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/component/protocol/title"
@@ -12546,6 +13073,9 @@
          <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="component-definition/component/control-implementation"
@@ -12555,7 +13085,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/defined-component/control-implementation"
                 _metaschema-json-id="/assembly/oscal-component-definition/defined-component/control-implementations"
                 name="control-implementation"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:control-implementation"
                 _step="control-implementation"
                 _key="control-implementations"
@@ -12618,6 +13148,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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="component-definition/component/control-implementation/link/text"
@@ -12640,6 +13176,9 @@
          <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/component/control-implementation/set-parameter/value"
@@ -12657,7 +13196,11 @@
              _in-xml-name="value"
              _in-json-name="values"
              gi="value"
-             in-json="SCALAR"/>
+             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"
@@ -12666,7 +13209,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/control-implementation/implemented-requirement"
                 _metaschema-json-id="/assembly/oscal-component-definition/control-implementation/implemented-requirements"
                 name="implemented-requirement"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:implemented-requirement"
                 _step="implemented-requirement"
                 _key="implemented-requirements"
@@ -12737,6 +13280,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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="component-definition/component/control-implementation/implemented-requirement/link/text"
@@ -12759,6 +13308,9 @@
          <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/component/control-implementation/implemented-requirement/set-parameter/value"
@@ -12776,7 +13328,11 @@
              _in-xml-name="value"
              _in-json-name="values"
              gi="value"
-             in-json="SCALAR"/>
+             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"
@@ -12798,6 +13354,9 @@
          <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/component/control-implementation/implemented-requirement/statement"
@@ -12807,7 +13366,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/implemented-requirement/statement"
                 _metaschema-json-id="/assembly/oscal-component-definition/implemented-requirement/statements"
                 name="statement"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:statement"
                 _step="statement"
                 _key="statements"
@@ -12864,6 +13423,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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="component-definition/component/control-implementation/implemented-requirement/statement/link/text"
@@ -12886,6 +13451,9 @@
          <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/component/control-implementation/implemented-requirement/statement/responsible-role/link/text"
@@ -12908,6 +13476,9 @@
          <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/capability/description"
@@ -12931,6 +13502,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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="component-definition/capability/link/text"
@@ -12953,6 +13530,9 @@
          <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/capability/incorporates-component/description"
@@ -12976,6 +13556,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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="component-definition/capability/control-implementation"
@@ -12985,7 +13571,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/capability/control-implementation"
                 _metaschema-json-id="/assembly/oscal-component-definition/capability/control-implementations"
                 name="control-implementation"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:control-implementation"
                 _step="control-implementation"
                 _key="control-implementations"
@@ -13048,6 +13634,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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="component-definition/capability/control-implementation/link/text"
@@ -13070,6 +13662,9 @@
          <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/capability/control-implementation/set-parameter/value"
@@ -13087,7 +13682,11 @@
              _in-xml-name="value"
              _in-json-name="values"
              gi="value"
-             in-json="SCALAR"/>
+             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"
@@ -13096,7 +13695,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/control-implementation/implemented-requirement"
                 _metaschema-json-id="/assembly/oscal-component-definition/control-implementation/implemented-requirements"
                 name="implemented-requirement"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:implemented-requirement"
                 _step="implemented-requirement"
                 _key="implemented-requirements"
@@ -13167,6 +13766,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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="component-definition/capability/control-implementation/implemented-requirement/link/text"
@@ -13189,6 +13794,9 @@
          <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/capability/control-implementation/implemented-requirement/set-parameter/value"
@@ -13206,7 +13814,11 @@
              _in-xml-name="value"
              _in-json-name="values"
              gi="value"
-             in-json="SCALAR"/>
+             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"
@@ -13228,6 +13840,9 @@
          <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/capability/control-implementation/implemented-requirement/statement"
@@ -13237,7 +13852,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/implemented-requirement/statement"
                 _metaschema-json-id="/assembly/oscal-component-definition/implemented-requirement/statements"
                 name="statement"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:statement"
                 _step="statement"
                 _key="statements"
@@ -13294,6 +13909,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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="component-definition/capability/control-implementation/implemented-requirement/statement/link/text"
@@ -13316,6 +13937,9 @@
          <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/capability/control-implementation/implemented-requirement/statement/responsible-role/link/text"
@@ -13338,6 +13962,9 @@
          <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/back-matter/resource"
@@ -13402,6 +14029,9 @@
          <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="component-definition/back-matter/resource/description"
@@ -13425,6 +14055,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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="component-definition/back-matter/resource/document-id"
@@ -13436,7 +14072,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -13505,6 +14141,9 @@
          <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/back-matter/resource/citation/link/text"
@@ -13527,6 +14166,9 @@
          <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/back-matter/resource/rlink"
@@ -13599,6 +14241,9 @@
          <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"
@@ -13611,7 +14256,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -13624,6 +14269,9 @@
          <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"
@@ -13636,7 +14284,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -13649,6 +14297,9 @@
          <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"
@@ -13661,7 +14312,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -13674,6 +14325,9 @@
          <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"
@@ -13686,7 +14340,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -13699,6 +14353,9 @@
          <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"
@@ -13708,7 +14365,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/revisions/revision"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/revisions"
                 name="revision"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:revision"
                 _step="revisions/revision"
                 _key="revisions"
@@ -13748,7 +14405,7 @@
              group-json="ARRAY"
              name="revision"
              key="revisions"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:revision"
              _key-ref="oscal-metadata:revision">
          <xsl:if test="$with-key">
@@ -13777,6 +14434,9 @@
          <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"
@@ -13789,7 +14449,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -13802,6 +14462,9 @@
          <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"
@@ -13814,7 +14477,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -13827,6 +14490,9 @@
          <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"
@@ -13839,7 +14505,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -13852,6 +14518,9 @@
          <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"
@@ -13864,7 +14533,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -13877,6 +14546,9 @@
          <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"
@@ -13899,6 +14571,9 @@
          <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"
@@ -13910,7 +14585,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -13945,6 +14620,9 @@
          <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/role/title"
@@ -13967,6 +14645,9 @@
          <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/role/short-name"
@@ -13989,6 +14670,9 @@
          <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="system-security-plan/metadata/role/description"
@@ -14012,6 +14696,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/role/link/text"
@@ -14034,6 +14724,9 @@
          <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/location/title"
@@ -14056,6 +14749,9 @@
          <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/location/address"
@@ -14066,7 +14762,7 @@
                 _metaschema-json-id="/assembly/oscal-metadata/location/address"
                 name="address"
                 key="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="address"
@@ -14101,7 +14797,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -14110,7 +14806,11 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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"
@@ -14132,6 +14832,9 @@
          <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="system-security-plan/metadata/location/address/state"
@@ -14154,6 +14857,9 @@
          <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="system-security-plan/metadata/location/address/postal-code"
@@ -14176,6 +14882,9 @@
          <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="system-security-plan/metadata/location/address/country"
@@ -14198,6 +14907,9 @@
          <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="system-security-plan/metadata/location/email-address"
@@ -14209,7 +14921,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -14218,7 +14930,11 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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"
@@ -14229,7 +14945,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -14259,7 +14975,11 @@
              _in-xml-name="url"
              _in-json-name="urls"
              gi="url"
-             in-json="SCALAR"/>
+             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"
@@ -14281,6 +15001,9 @@
          <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/name"
@@ -14303,6 +15026,9 @@
          <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="system-security-plan/metadata/party/short-name"
@@ -14325,6 +15051,9 @@
          <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="system-security-plan/metadata/party/external-id"
@@ -14368,6 +15097,9 @@
          <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/email-address"
@@ -14379,7 +15111,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -14388,7 +15120,11 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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"
@@ -14399,7 +15135,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -14421,7 +15157,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/party/address"
                 _metaschema-json-id="/assembly/oscal-metadata/party/addresses"
                 name="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="addresses"
@@ -14453,7 +15189,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -14462,7 +15198,11 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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"
@@ -14484,6 +15224,9 @@
          <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="system-security-plan/metadata/party/address/state"
@@ -14506,6 +15249,9 @@
          <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="system-security-plan/metadata/party/address/postal-code"
@@ -14528,6 +15274,9 @@
          <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="system-security-plan/metadata/party/address/country"
@@ -14550,6 +15299,9 @@
          <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="system-security-plan/metadata/party/member-of-organization"
@@ -14567,7 +15319,11 @@
              _in-xml-name="member-of-organization"
              _in-json-name="member-of-organizations"
              gi="member-of-organization"
-             in-json="SCALAR"/>
+             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"
@@ -14589,6 +15345,9 @@
          <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"
@@ -14611,6 +15370,9 @@
          <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/system-characteristics/system-name-short"
@@ -14633,6 +15395,9 @@
          <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/system-characteristics/description"
@@ -14656,6 +15421,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -14678,6 +15449,9 @@
          <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/date-authorized"
@@ -14690,7 +15464,7 @@
              as-type="date"
              name="date-authorized"
              key="date-authorized"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:date-authorized"
              _step="date-authorized"
              _key="date-authorized"
@@ -14703,6 +15477,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">date-authorized</xsl:attribute>
          </xsl:if>
+         <value as-type="date" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/security-sensitivity-level"
@@ -14725,6 +15502,9 @@
          <xsl:if test="$with-key">
             <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/system-characteristics/system-information/link/text"
@@ -14747,6 +15527,9 @@
          <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"
@@ -14811,6 +15594,9 @@
          <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"
@@ -14834,6 +15620,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -14874,7 +15666,11 @@
              _in-xml-name="information-type-id"
              _in-json-name="information-type-ids"
              gi="information-type-id"
-             in-json="SCALAR"/>
+             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"
@@ -14896,6 +15692,9 @@
          <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/confidentiality-impact"
@@ -14954,6 +15753,9 @@
          <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/confidentiality-impact/base"
@@ -14966,7 +15768,7 @@
              as-type="string"
              name="base"
              key="base"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:base"
              _step="base"
              _key="base"
@@ -14979,6 +15781,9 @@
          <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/system-characteristics/system-information/information-type/confidentiality-impact/selected"
@@ -14991,7 +15796,7 @@
              as-type="string"
              name="selected"
              key="selected"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:selected"
              _step="selected"
              _key="selected"
@@ -15004,6 +15809,9 @@
          <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/system-characteristics/system-information/information-type/confidentiality-impact/adjustment-justification"
@@ -15017,7 +15825,7 @@
              as-type="markup-multiline"
              name="adjustment-justification"
              key="adjustment-justification"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:adjustment-justification"
              _step="adjustment-justification"
              _key="adjustment-justification"
@@ -15030,6 +15838,12 @@
          <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/system-information/information-type/integrity-impact"
@@ -15088,6 +15902,9 @@
          <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/integrity-impact/base"
@@ -15100,7 +15917,7 @@
              as-type="string"
              name="base"
              key="base"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:base"
              _step="base"
              _key="base"
@@ -15113,6 +15930,9 @@
          <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/system-characteristics/system-information/information-type/integrity-impact/selected"
@@ -15125,7 +15945,7 @@
              as-type="string"
              name="selected"
              key="selected"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:selected"
              _step="selected"
              _key="selected"
@@ -15138,6 +15958,9 @@
          <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/system-characteristics/system-information/information-type/integrity-impact/adjustment-justification"
@@ -15151,7 +15974,7 @@
              as-type="markup-multiline"
              name="adjustment-justification"
              key="adjustment-justification"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:adjustment-justification"
              _step="adjustment-justification"
              _key="adjustment-justification"
@@ -15164,6 +15987,12 @@
          <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/system-information/information-type/availability-impact"
@@ -15222,6 +16051,9 @@
          <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/availability-impact/base"
@@ -15234,7 +16066,7 @@
              as-type="string"
              name="base"
              key="base"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:base"
              _step="base"
              _key="base"
@@ -15247,6 +16079,9 @@
          <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/system-characteristics/system-information/information-type/availability-impact/selected"
@@ -15259,7 +16094,7 @@
              as-type="string"
              name="selected"
              key="selected"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:selected"
              _step="selected"
              _key="selected"
@@ -15272,6 +16107,9 @@
          <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/system-characteristics/system-information/information-type/availability-impact/adjustment-justification"
@@ -15285,7 +16123,7 @@
              as-type="markup-multiline"
              name="adjustment-justification"
              key="adjustment-justification"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:adjustment-justification"
              _step="adjustment-justification"
              _key="adjustment-justification"
@@ -15298,6 +16136,12 @@
          <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"
@@ -15320,6 +16164,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">security-objective-confidentiality</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/security-impact-level/security-objective-integrity"
@@ -15342,6 +16189,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">security-objective-integrity</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/security-impact-level/security-objective-availability"
@@ -15364,6 +16214,9 @@
          <xsl:if test="$with-key">
             <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/status"
@@ -15374,7 +16227,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/status"
                 name="status"
                 key="status"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:status"
                 _step="status"
                 _key="status"
@@ -15411,6 +16264,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -15433,6 +16292,9 @@
          <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"
@@ -15456,6 +16318,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/diagram/link/text"
@@ -15478,6 +16346,9 @@
          <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/caption"
@@ -15500,6 +16371,9 @@
          <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/authorization-boundary/diagram/remarks"
@@ -15523,6 +16397,12 @@
          <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="system-security-plan/system-characteristics/authorization-boundary/remarks"
@@ -15546,6 +16426,12 @@
          <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="system-security-plan/system-characteristics/network-architecture/description"
@@ -15569,6 +16455,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/network-architecture/link/text"
@@ -15591,6 +16483,9 @@
          <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/network-architecture/diagram/description"
@@ -15614,6 +16509,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/network-architecture/diagram/link/text"
@@ -15636,6 +16537,9 @@
          <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/network-architecture/diagram/caption"
@@ -15658,6 +16562,9 @@
          <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/diagram/remarks"
@@ -15681,6 +16588,12 @@
          <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="system-security-plan/system-characteristics/data-flow/description"
@@ -15704,6 +16617,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -15726,6 +16645,9 @@
          <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/diagram/description"
@@ -15749,6 +16671,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/diagram/link/text"
@@ -15771,6 +16699,9 @@
          <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/diagram/caption"
@@ -15793,6 +16724,9 @@
          <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/data-flow/diagram/remarks"
@@ -15816,6 +16750,12 @@
          <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="system-security-plan/system-characteristics/responsible-party/link/text"
@@ -15838,6 +16778,9 @@
          <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-implementation/link/text"
@@ -15860,6 +16803,9 @@
          <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-implementation/leveraged-authorization"
@@ -15916,6 +16862,9 @@
          <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-implementation/leveraged-authorization/link/text"
@@ -15938,6 +16887,9 @@
          <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-implementation/leveraged-authorization/party-uuid"
@@ -15960,6 +16912,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">party-uuid</xsl:attribute>
          </xsl:if>
+         <value as-type="uuid" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-implementation/leveraged-authorization/date-authorized"
@@ -15972,7 +16927,7 @@
              as-type="date"
              name="date-authorized"
              key="date-authorized"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:date-authorized"
              _step="date-authorized"
              _key="date-authorized"
@@ -15985,6 +16940,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">date-authorized</xsl:attribute>
          </xsl:if>
+         <value as-type="date" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-implementation/user/title"
@@ -16007,6 +16965,9 @@
          <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-implementation/user/short-name"
@@ -16029,6 +16990,9 @@
          <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="system-security-plan/system-implementation/user/description"
@@ -16052,6 +17016,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/user/link/text"
@@ -16074,6 +17044,9 @@
          <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-implementation/user/authorized-privilege/title"
@@ -16096,6 +17069,9 @@
          <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-implementation/user/authorized-privilege/description"
@@ -16119,6 +17095,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/component/title"
@@ -16141,6 +17123,9 @@
          <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-implementation/component/description"
@@ -16164,6 +17149,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/component/purpose"
@@ -16186,6 +17177,9 @@
          <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="system-security-plan/system-implementation/component/link/text"
@@ -16208,6 +17202,9 @@
          <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-implementation/component/status"
@@ -16251,6 +17248,9 @@
          <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-implementation/component/protocol/title"
@@ -16273,6 +17273,9 @@
          <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-implementation/inventory-item/description"
@@ -16296,6 +17299,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/link/text"
@@ -16318,6 +17327,9 @@
          <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-implementation/inventory-item/responsible-party/link/text"
@@ -16340,6 +17352,9 @@
          <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-implementation/inventory-item/implemented-component"
@@ -16400,6 +17415,9 @@
          <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-implementation/inventory-item/implemented-component/responsible-party/link/text"
@@ -16422,6 +17440,9 @@
          <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"
@@ -16432,7 +17453,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-security-plan/control-implementation"
                 name="control-implementation"
                 key="control-implementation"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:control-implementation"
                 _step="control-implementation"
                 _key="control-implementation"
@@ -16482,6 +17503,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/set-parameter/value"
@@ -16499,7 +17526,11 @@
              _in-xml-name="value"
              _in-json-name="values"
              gi="value"
-             in-json="SCALAR"/>
+             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"
@@ -16508,7 +17539,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ssp/control-implementation/implemented-requirement"
                 _metaschema-json-id="/assembly/oscal-ssp/control-implementation/implemented-requirements"
                 name="implemented-requirement"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:implemented-requirement"
                 _step="implemented-requirement"
                 _key="implemented-requirements"
@@ -16584,6 +17615,9 @@
          <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/set-parameter/value"
@@ -16601,7 +17635,11 @@
              _in-xml-name="value"
              _in-json-name="values"
              gi="value"
-             in-json="SCALAR"/>
+             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"
@@ -16623,6 +17661,9 @@
          <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"
@@ -16632,7 +17673,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ssp/implemented-requirement/statement"
                 _metaschema-json-id="/assembly/oscal-ssp/implemented-requirement/statements"
                 name="statement"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:statement"
                 _step="statement"
                 _key="statements"
@@ -16694,6 +17735,9 @@
          <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"
@@ -16716,6 +17760,9 @@
          <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"
@@ -16739,6 +17786,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/link/text"
@@ -16761,6 +17814,9 @@
          <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/set-parameter/value"
@@ -16778,7 +17834,11 @@
              _in-xml-name="value"
              _in-json-name="values"
              gi="value"
-             in-json="SCALAR"/>
+             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"
@@ -16850,6 +17910,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/link/text"
@@ -16872,6 +17938,9 @@
          <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/provided"
@@ -16934,6 +18003,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/provided/link/text"
@@ -16956,6 +18031,9 @@
          <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/provided/responsible-role/link/text"
@@ -16978,6 +18056,9 @@
          <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/responsibility"
@@ -17041,6 +18122,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -17063,6 +18150,9 @@
          <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/responsibility/responsible-role/link/text"
@@ -17085,6 +18175,9 @@
          <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/inherited"
@@ -17147,6 +18240,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/inherited/link/text"
@@ -17169,6 +18268,9 @@
          <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/inherited/responsible-role/link/text"
@@ -17191,6 +18293,9 @@
          <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/satisfied"
@@ -17254,6 +18359,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/satisfied/link/text"
@@ -17276,6 +18387,9 @@
          <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/satisfied/responsible-role/link/text"
@@ -17298,6 +18412,9 @@
          <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/responsible-role/link/text"
@@ -17320,6 +18437,9 @@
          <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"
@@ -17343,6 +18463,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/link/text"
@@ -17365,6 +18491,9 @@
          <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"
@@ -17382,7 +18511,11 @@
              _in-xml-name="value"
              _in-json-name="values"
              gi="value"
-             in-json="SCALAR"/>
+             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"
@@ -17454,6 +18587,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/link/text"
@@ -17476,6 +18615,9 @@
          <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/export/provided"
@@ -17538,6 +18680,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/provided/link/text"
@@ -17560,6 +18708,9 @@
          <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/export/provided/responsible-role/link/text"
@@ -17582,6 +18733,9 @@
          <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/export/responsibility"
@@ -17645,6 +18799,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -17667,6 +18827,9 @@
          <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/export/responsibility/responsible-role/link/text"
@@ -17689,6 +18852,9 @@
          <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"
@@ -17751,6 +18917,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/inherited/link/text"
@@ -17773,6 +18945,9 @@
          <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"
@@ -17795,6 +18970,9 @@
          <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/satisfied"
@@ -17858,6 +19036,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/satisfied/link/text"
@@ -17880,6 +19064,9 @@
          <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/satisfied/responsible-role/link/text"
@@ -17902,6 +19089,9 @@
          <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/responsible-role/link/text"
@@ -17924,6 +19114,9 @@
          <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"
@@ -17988,6 +19181,9 @@
          <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"
@@ -18011,6 +19207,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/back-matter/resource/document-id"
@@ -18022,7 +19224,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -18091,6 +19293,9 @@
          <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"
@@ -18113,6 +19318,9 @@
          <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"
@@ -18185,6 +19393,9 @@
          <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/published"
@@ -18197,7 +19408,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -18210,6 +19421,9 @@
          <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="assessment-plan/metadata/last-modified"
@@ -18222,7 +19436,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -18235,6 +19449,9 @@
          <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="assessment-plan/metadata/version"
@@ -18247,7 +19464,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -18260,6 +19477,9 @@
          <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/oscal-version"
@@ -18272,7 +19492,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -18285,6 +19505,9 @@
          <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"
@@ -18294,7 +19517,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/revisions/revision"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/revisions"
                 name="revision"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:revision"
                 _step="revisions/revision"
                 _key="revisions"
@@ -18334,7 +19557,7 @@
              group-json="ARRAY"
              name="revision"
              key="revisions"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:revision"
              _key-ref="oscal-metadata:revision">
          <xsl:if test="$with-key">
@@ -18363,6 +19586,9 @@
          <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/revisions/revision/published"
@@ -18375,7 +19601,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -18388,6 +19614,9 @@
          <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="assessment-plan/metadata/revisions/revision/last-modified"
@@ -18400,7 +19629,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -18413,6 +19642,9 @@
          <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="assessment-plan/metadata/revisions/revision/version"
@@ -18425,7 +19657,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -18438,6 +19670,9 @@
          <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"
@@ -18450,7 +19685,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -18463,6 +19698,9 @@
          <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"
@@ -18485,6 +19723,9 @@
          <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/document-id"
@@ -18496,7 +19737,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -18531,6 +19772,9 @@
          <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/role/title"
@@ -18553,6 +19797,9 @@
          <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/role/short-name"
@@ -18575,6 +19822,9 @@
          <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/metadata/role/description"
@@ -18598,6 +19848,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/role/link/text"
@@ -18620,6 +19876,9 @@
          <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/title"
@@ -18642,6 +19901,9 @@
          <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/location/address"
@@ -18652,7 +19914,7 @@
                 _metaschema-json-id="/assembly/oscal-metadata/location/address"
                 name="address"
                 key="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="address"
@@ -18687,7 +19949,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -18696,7 +19958,11 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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"
@@ -18718,6 +19984,9 @@
          <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="assessment-plan/metadata/location/address/state"
@@ -18740,6 +20009,9 @@
          <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="assessment-plan/metadata/location/address/postal-code"
@@ -18762,6 +20034,9 @@
          <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="assessment-plan/metadata/location/address/country"
@@ -18784,6 +20059,9 @@
          <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="assessment-plan/metadata/location/email-address"
@@ -18795,7 +20073,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -18804,7 +20082,11 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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"
@@ -18815,7 +20097,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -18845,7 +20127,11 @@
              _in-xml-name="url"
              _in-json-name="urls"
              gi="url"
-             in-json="SCALAR"/>
+             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"
@@ -18867,6 +20153,9 @@
          <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/party/name"
@@ -18889,6 +20178,9 @@
          <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="assessment-plan/metadata/party/short-name"
@@ -18911,6 +20203,9 @@
          <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/metadata/party/external-id"
@@ -18954,6 +20249,9 @@
          <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/party/email-address"
@@ -18965,7 +20263,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -18974,7 +20272,11 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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"
@@ -18985,7 +20287,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -19007,7 +20309,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/party/address"
                 _metaschema-json-id="/assembly/oscal-metadata/party/addresses"
                 name="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="addresses"
@@ -19039,7 +20341,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -19048,7 +20350,11 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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"
@@ -19070,6 +20376,9 @@
          <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="assessment-plan/metadata/party/address/state"
@@ -19092,6 +20401,9 @@
          <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="assessment-plan/metadata/party/address/postal-code"
@@ -19114,6 +20426,9 @@
          <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="assessment-plan/metadata/party/address/country"
@@ -19136,6 +20451,9 @@
          <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="assessment-plan/metadata/party/member-of-organization"
@@ -19153,7 +20471,11 @@
              _in-xml-name="member-of-organization"
              _in-json-name="member-of-organizations"
              gi="member-of-organization"
-             in-json="SCALAR"/>
+             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"
@@ -19175,6 +20497,9 @@
          <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/local-definitions"
@@ -19252,6 +20577,9 @@
          <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/component/description"
@@ -19275,6 +20603,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/purpose"
@@ -19297,6 +20631,9 @@
          <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/local-definitions/component/link/text"
@@ -19319,6 +20656,9 @@
          <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/local-definitions/component/status"
@@ -19362,6 +20702,9 @@
          <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/local-definitions/component/protocol/title"
@@ -19384,6 +20727,9 @@
          <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/inventory-item/description"
@@ -19407,6 +20753,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/link/text"
@@ -19429,6 +20781,9 @@
          <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/local-definitions/inventory-item/responsible-party/link/text"
@@ -19451,6 +20806,9 @@
          <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/local-definitions/inventory-item/implemented-component"
@@ -19511,6 +20869,9 @@
          <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/local-definitions/inventory-item/implemented-component/responsible-party/link/text"
@@ -19533,6 +20894,9 @@
          <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/local-definitions/user/title"
@@ -19555,6 +20919,9 @@
          <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/short-name"
@@ -19577,6 +20944,9 @@
          <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"
@@ -19600,6 +20970,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/user/link/text"
@@ -19622,6 +20998,9 @@
          <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/local-definitions/user/authorized-privilege/title"
@@ -19644,6 +21023,9 @@
          <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"
@@ -19667,6 +21049,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/objectives-and-methods/description"
@@ -19690,6 +21078,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/objectives-and-methods/link/text"
@@ -19712,6 +21106,9 @@
          <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/local-definitions/objectives-and-methods//part/title"
@@ -19734,28 +21131,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/objectives-and-methods//part"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _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"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl: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/objectives-and-methods//part/link/text"
@@ -19778,6 +21156,9 @@
          <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/local-definitions/activity/title"
@@ -19800,6 +21181,9 @@
          <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/activity/description"
@@ -19823,6 +21207,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/link/text"
@@ -19845,6 +21235,9 @@
          <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/local-definitions/activity/step"
@@ -19908,6 +21301,9 @@
          <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/activity/step/description"
@@ -19931,6 +21327,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -19953,6 +21355,9 @@
          <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/local-definitions/activity/step/reviewed-controls/description"
@@ -19976,6 +21381,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -19998,6 +21409,9 @@
          <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/local-definitions/activity/step/reviewed-controls/control-selection"
@@ -20067,6 +21481,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/control-selection/link/text"
@@ -20089,6 +21509,9 @@
          <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/local-definitions/activity/step/reviewed-controls/control-selection/include-all"
@@ -20118,7 +21541,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="include-control"
                 _key="include-controls"
@@ -20152,7 +21575,11 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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"
@@ -20161,7 +21588,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/exclude-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/exclude-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="exclude-control"
                 _key="exclude-controls"
@@ -20195,7 +21622,11 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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"
@@ -20264,6 +21695,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/control-objective-selection/link/text"
@@ -20286,6 +21723,9 @@
          <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/local-definitions/activity/step/reviewed-controls/control-objective-selection/include-all"
@@ -20328,6 +21768,9 @@
          <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/local-definitions/activity/related-controls/description"
@@ -20351,6 +21794,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/related-controls/link/text"
@@ -20373,6 +21822,9 @@
          <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/local-definitions/activity/related-controls/control-selection"
@@ -20442,6 +21894,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/related-controls/control-selection/link/text"
@@ -20464,6 +21922,9 @@
          <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/local-definitions/activity/related-controls/control-selection/include-all"
@@ -20493,7 +21954,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="include-control"
                 _key="include-controls"
@@ -20527,7 +21988,11 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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"
@@ -20536,7 +22001,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/exclude-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/exclude-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="exclude-control"
                 _key="exclude-controls"
@@ -20570,7 +22035,11 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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"
@@ -20639,6 +22108,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/related-controls/control-objective-selection/link/text"
@@ -20661,6 +22136,9 @@
          <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/local-definitions/activity/related-controls/control-objective-selection/include-all"
@@ -20703,6 +22181,9 @@
          <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/terms-and-conditions"
@@ -20751,28 +22232,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-plan/terms-and-conditions//part"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _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"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl: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"
@@ -20795,6 +22257,9 @@
          <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/description"
@@ -20818,6 +22283,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/reviewed-controls/link/text"
@@ -20840,6 +22311,9 @@
          <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-selection"
@@ -20909,6 +22383,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/reviewed-controls/control-selection/link/text"
@@ -20931,6 +22411,9 @@
          <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-selection/include-all"
@@ -20960,7 +22443,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="include-control"
                 _key="include-controls"
@@ -20994,7 +22477,11 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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"
@@ -21003,7 +22490,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/exclude-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/exclude-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="exclude-control"
                 _key="exclude-controls"
@@ -21037,7 +22524,11 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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"
@@ -21106,6 +22597,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/reviewed-controls/control-objective-selection/link/text"
@@ -21128,6 +22625,9 @@
          <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/include-all"
@@ -21171,6 +22671,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -21193,6 +22699,9 @@
          <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/include-all"
@@ -21235,6 +22744,9 @@
          <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"
@@ -21257,6 +22769,9 @@
          <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"
@@ -21279,6 +22794,9 @@
          <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"
@@ -21302,6 +22820,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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-assets/component/purpose"
@@ -21324,6 +22848,9 @@
          <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"
@@ -21346,6 +22873,9 @@
          <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/status"
@@ -21389,6 +22919,9 @@
          <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"
@@ -21411,6 +22944,9 @@
          <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"
@@ -21472,6 +23008,9 @@
          <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"
@@ -21494,6 +23033,9 @@
          <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"
@@ -21554,6 +23096,9 @@
          <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"
@@ -21576,6 +23121,9 @@
          <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"
@@ -21598,6 +23146,9 @@
          <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"
@@ -21621,6 +23172,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/link/text"
@@ -21643,6 +23200,9 @@
          <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/timing"
@@ -21814,6 +23374,9 @@
          <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"
@@ -21836,6 +23399,9 @@
          <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"
@@ -21859,6 +23425,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/associated-activity/subject/link/text"
@@ -21881,6 +23453,9 @@
          <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/include-all"
@@ -21923,6 +23498,9 @@
          <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/exclude-subject/link/text"
@@ -21945,6 +23523,9 @@
          <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/subject/description"
@@ -21968,6 +23549,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -21990,6 +23577,9 @@
          <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/subject/include-all"
@@ -22032,6 +23622,9 @@
          <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/subject/exclude-subject/link/text"
@@ -22054,6 +23647,9 @@
          <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/responsible-role/link/text"
@@ -22076,6 +23672,9 @@
          <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"
@@ -22140,6 +23739,9 @@
          <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"
@@ -22163,6 +23765,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/back-matter/resource/document-id"
@@ -22174,7 +23782,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -22243,6 +23851,9 @@
          <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/link/text"
@@ -22265,6 +23876,9 @@
          <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"
@@ -22337,6 +23951,9 @@
          <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/published"
@@ -22349,7 +23966,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -22362,6 +23979,9 @@
          <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="assessment-results/metadata/last-modified"
@@ -22374,7 +23994,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -22387,6 +24007,9 @@
          <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="assessment-results/metadata/version"
@@ -22399,7 +24022,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -22412,6 +24035,9 @@
          <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-results/metadata/oscal-version"
@@ -22424,7 +24050,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -22437,6 +24063,9 @@
          <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-results/metadata/revisions/revision"
@@ -22446,7 +24075,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/revisions/revision"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/revisions"
                 name="revision"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:revision"
                 _step="revisions/revision"
                 _key="revisions"
@@ -22486,7 +24115,7 @@
              group-json="ARRAY"
              name="revision"
              key="revisions"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:revision"
              _key-ref="oscal-metadata:revision">
          <xsl:if test="$with-key">
@@ -22515,6 +24144,9 @@
          <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/revisions/revision/published"
@@ -22527,7 +24159,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -22540,6 +24172,9 @@
          <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="assessment-results/metadata/revisions/revision/last-modified"
@@ -22552,7 +24187,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -22565,6 +24200,9 @@
          <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="assessment-results/metadata/revisions/revision/version"
@@ -22577,7 +24215,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -22590,6 +24228,9 @@
          <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-results/metadata/revisions/revision/oscal-version"
@@ -22602,7 +24243,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -22615,6 +24256,9 @@
          <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-results/metadata/revisions/revision/link/text"
@@ -22637,6 +24281,9 @@
          <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/document-id"
@@ -22648,7 +24295,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -22683,6 +24330,9 @@
          <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/role/title"
@@ -22705,6 +24355,9 @@
          <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/role/short-name"
@@ -22727,6 +24380,9 @@
          <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"
@@ -22750,6 +24406,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -22772,6 +24434,9 @@
          <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/title"
@@ -22794,6 +24459,9 @@
          <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"
@@ -22804,7 +24472,7 @@
                 _metaschema-json-id="/assembly/oscal-metadata/location/address"
                 name="address"
                 key="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="address"
@@ -22839,7 +24507,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -22848,7 +24516,11 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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"
@@ -22870,6 +24542,9 @@
          <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="assessment-results/metadata/location/address/state"
@@ -22892,6 +24567,9 @@
          <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="assessment-results/metadata/location/address/postal-code"
@@ -22914,6 +24592,9 @@
          <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="assessment-results/metadata/location/address/country"
@@ -22936,6 +24617,9 @@
          <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="assessment-results/metadata/location/email-address"
@@ -22947,7 +24631,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -22956,7 +24640,11 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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"
@@ -22967,7 +24655,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -22997,7 +24685,11 @@
              _in-xml-name="url"
              _in-json-name="urls"
              gi="url"
-             in-json="SCALAR"/>
+             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"
@@ -23019,6 +24711,9 @@
          <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/name"
@@ -23041,6 +24736,9 @@
          <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="assessment-results/metadata/party/short-name"
@@ -23063,6 +24761,9 @@
          <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/party/external-id"
@@ -23106,6 +24807,9 @@
          <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/email-address"
@@ -23117,7 +24821,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -23126,7 +24830,11 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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"
@@ -23137,7 +24845,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -23159,7 +24867,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/party/address"
                 _metaschema-json-id="/assembly/oscal-metadata/party/addresses"
                 name="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="addresses"
@@ -23191,7 +24899,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -23200,7 +24908,11 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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"
@@ -23222,6 +24934,9 @@
          <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="assessment-results/metadata/party/address/state"
@@ -23244,6 +24959,9 @@
          <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="assessment-results/metadata/party/address/postal-code"
@@ -23266,6 +24984,9 @@
          <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="assessment-results/metadata/party/address/country"
@@ -23288,6 +25009,9 @@
          <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="assessment-results/metadata/party/member-of-organization"
@@ -23305,7 +25029,11 @@
              _in-xml-name="member-of-organization"
              _in-json-name="member-of-organizations"
              gi="member-of-organization"
-             in-json="SCALAR"/>
+             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"
@@ -23327,6 +25055,9 @@
          <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"
@@ -23384,6 +25115,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/objectives-and-methods/link/text"
@@ -23406,6 +25143,9 @@
          <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/title"
@@ -23428,28 +25168,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-results/local-definitions/objectives-and-methods//part"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _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"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl: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"
@@ -23472,6 +25193,9 @@
          <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/title"
@@ -23494,6 +25218,9 @@
          <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/description"
@@ -23517,6 +25244,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -23539,6 +25272,9 @@
          <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"
@@ -23602,6 +25338,9 @@
          <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/description"
@@ -23625,6 +25364,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/link/text"
@@ -23647,6 +25392,9 @@
          <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/description"
@@ -23670,6 +25418,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/link/text"
@@ -23692,6 +25446,9 @@
          <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"
@@ -23761,6 +25518,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -23783,6 +25546,9 @@
          <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/include-all"
@@ -23812,7 +25578,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="include-control"
                 _key="include-controls"
@@ -23846,7 +25612,11 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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"
@@ -23855,7 +25625,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/exclude-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/exclude-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="exclude-control"
                 _key="exclude-controls"
@@ -23889,7 +25659,11 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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"
@@ -23958,6 +25732,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -23980,6 +25760,9 @@
          <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-objective-selection/include-all"
@@ -24022,6 +25805,9 @@
          <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/related-controls/description"
@@ -24045,6 +25831,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -24067,6 +25859,9 @@
          <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/related-controls/control-selection"
@@ -24136,6 +25931,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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-selection/link/text"
@@ -24158,6 +25959,9 @@
          <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/related-controls/control-selection/include-all"
@@ -24187,7 +25991,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="include-control"
                 _key="include-controls"
@@ -24221,7 +26025,11 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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"
@@ -24230,7 +26038,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/exclude-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/exclude-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="exclude-control"
                 _key="exclude-controls"
@@ -24264,7 +26072,11 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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"
@@ -24333,6 +26145,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -24355,6 +26173,9 @@
          <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/related-controls/control-objective-selection/include-all"
@@ -24397,6 +26218,9 @@
          <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/title"
@@ -24419,6 +26243,9 @@
          <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"
@@ -24442,6 +26269,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/start"
@@ -24464,6 +26297,9 @@
          <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"
@@ -24486,6 +26322,9 @@
          <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/link/text"
@@ -24508,6 +26347,9 @@
          <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"
@@ -24578,6 +26420,9 @@
          <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/component/description"
@@ -24601,6 +26446,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/component/purpose"
@@ -24623,6 +26474,9 @@
          <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-results/result/local-definitions/component/link/text"
@@ -24645,6 +26499,9 @@
          <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/component/status"
@@ -24688,6 +26545,9 @@
          <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/component/protocol/title"
@@ -24710,6 +26570,9 @@
          <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/inventory-item/description"
@@ -24733,6 +26596,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/link/text"
@@ -24755,6 +26624,9 @@
          <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"
@@ -24777,6 +26649,9 @@
          <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/implemented-component"
@@ -24837,6 +26712,9 @@
          <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/implemented-component/responsible-party/link/text"
@@ -24859,6 +26737,9 @@
          <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/user/title"
@@ -24881,6 +26762,9 @@
          <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/user/short-name"
@@ -24903,6 +26787,9 @@
          <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"
@@ -24926,6 +26813,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/user/link/text"
@@ -24948,6 +26841,9 @@
          <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/user/authorized-privilege/title"
@@ -24970,6 +26866,9 @@
          <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/user/authorized-privilege/description"
@@ -24993,6 +26892,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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-assets/component/title"
@@ -25015,6 +26920,9 @@
          <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-assets/component/description"
@@ -25038,6 +26946,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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-assets/component/purpose"
@@ -25060,6 +26974,9 @@
          <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-results/result/local-definitions/assessment-assets/component/link/text"
@@ -25082,6 +26999,9 @@
          <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/component/status"
@@ -25125,6 +27045,9 @@
          <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/component/protocol/title"
@@ -25147,6 +27070,9 @@
          <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-assets/assessment-platform"
@@ -25208,6 +27134,9 @@
          <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-assets/assessment-platform/link/text"
@@ -25230,6 +27159,9 @@
          <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"
@@ -25290,6 +27222,9 @@
          <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"
@@ -25312,6 +27247,9 @@
          <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"
@@ -25334,6 +27272,9 @@
          <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"
@@ -25357,6 +27298,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/link/text"
@@ -25379,6 +27326,9 @@
          <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/timing"
@@ -25550,6 +27500,9 @@
          <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/associated-activity/responsible-role/link/text"
@@ -25572,6 +27525,9 @@
          <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/associated-activity/subject/description"
@@ -25595,6 +27551,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -25617,6 +27579,9 @@
          <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/associated-activity/subject/include-all"
@@ -25659,6 +27624,9 @@
          <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/associated-activity/subject/exclude-subject/link/text"
@@ -25681,6 +27649,9 @@
          <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/subject/description"
@@ -25704,6 +27675,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/subject/link/text"
@@ -25726,6 +27703,9 @@
          <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/subject/include-all"
@@ -25768,6 +27748,9 @@
          <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/subject/exclude-subject/link/text"
@@ -25790,6 +27773,9 @@
          <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/responsible-role/link/text"
@@ -25812,6 +27798,9 @@
          <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/reviewed-controls/description"
@@ -25835,6 +27824,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/reviewed-controls/link/text"
@@ -25857,6 +27852,9 @@
          <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/reviewed-controls/control-selection"
@@ -25926,6 +27924,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/reviewed-controls/control-selection/link/text"
@@ -25948,6 +27952,9 @@
          <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/reviewed-controls/control-selection/include-all"
@@ -25977,7 +27984,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="include-control"
                 _key="include-controls"
@@ -26011,7 +28018,11 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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"
@@ -26020,7 +28031,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/exclude-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/exclude-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="exclude-control"
                 _key="exclude-controls"
@@ -26054,7 +28065,11 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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"
@@ -26123,6 +28138,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/reviewed-controls/control-objective-selection/link/text"
@@ -26145,6 +28166,9 @@
          <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/reviewed-controls/control-objective-selection/include-all"
@@ -26216,6 +28240,9 @@
          <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/attestation//part/title"
@@ -26238,28 +28265,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/attestation//part"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _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"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl: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"
@@ -26282,6 +28290,9 @@
          <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/assessment-log"
@@ -26379,6 +28390,9 @@
          <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/assessment-log/entry/description"
@@ -26402,6 +28416,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -26424,6 +28444,9 @@
          <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/assessment-log/entry/end"
@@ -26446,6 +28469,9 @@
          <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/assessment-log/entry/link/text"
@@ -26468,6 +28494,9 @@
          <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/assessment-log/entry/related-task/link/text"
@@ -26490,6 +28519,9 @@
          <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/assessment-log/entry/related-task/responsible-party/link/text"
@@ -26512,6 +28544,9 @@
          <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/assessment-log/entry/related-task/subject/description"
@@ -26535,6 +28570,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/related-task/subject/link/text"
@@ -26557,6 +28598,9 @@
          <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/assessment-log/entry/related-task/subject/include-all"
@@ -26599,6 +28643,9 @@
          <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/assessment-log/entry/related-task/subject/exclude-subject/link/text"
@@ -26621,6 +28668,9 @@
          <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/assessment-log/entry/related-task/identified-subject"
@@ -26671,6 +28721,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/related-task/identified-subject/subject/link/text"
@@ -26693,6 +28749,9 @@
          <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/assessment-log/entry/related-task/identified-subject/subject/include-all"
@@ -26735,6 +28794,9 @@
          <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/assessment-log/entry/related-task/identified-subject/subject/exclude-subject/link/text"
@@ -26757,6 +28819,9 @@
          <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/title"
@@ -26779,6 +28844,9 @@
          <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/description"
@@ -26802,6 +28870,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/link/text"
@@ -26824,6 +28898,9 @@
          <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/method"
@@ -26841,7 +28918,11 @@
              _in-xml-name="method"
              _in-json-name="methods"
              gi="method"
-             in-json="SCALAR"/>
+             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"
@@ -26858,7 +28939,11 @@
              _in-xml-name="type"
              _in-json-name="types"
              gi="type"
-             in-json="SCALAR"/>
+             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"
@@ -26880,6 +28965,9 @@
          <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/link/text"
@@ -26902,6 +28990,9 @@
          <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/responsible-party/link/text"
@@ -26924,6 +29015,9 @@
          <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/subject/description"
@@ -26947,6 +29041,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/related-task/subject/link/text"
@@ -26969,6 +29069,9 @@
          <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/subject/include-all"
@@ -27011,6 +29114,9 @@
          <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/subject/exclude-subject/link/text"
@@ -27033,6 +29139,9 @@
          <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"
@@ -27083,6 +29192,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/related-task/identified-subject/subject/link/text"
@@ -27105,6 +29220,9 @@
          <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-all"
@@ -27147,6 +29265,9 @@
          <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"
@@ -27169,6 +29290,9 @@
          <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/subject"
@@ -27178,7 +29302,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/observation/subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/observation/subjects"
                 name="subject-reference"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:subject-reference"
                 _step="subject"
                 _key="subjects"
@@ -27227,6 +29351,9 @@
          <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"
@@ -27249,6 +29376,9 @@
          <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"
@@ -27304,6 +29434,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -27326,6 +29462,9 @@
          <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"
@@ -27348,6 +29487,9 @@
          <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"
@@ -27370,6 +29512,9 @@
          <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"
@@ -27392,6 +29537,9 @@
          <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/description"
@@ -27415,6 +29563,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -27438,6 +29592,12 @@
          <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()">
+               <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"
@@ -27460,6 +29620,9 @@
          <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/status"
@@ -27482,6 +29645,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
+         <value as-type="token" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/origin/actor/link/text"
@@ -27504,6 +29670,9 @@
          <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/origin/related-task/link/text"
@@ -27526,6 +29695,9 @@
          <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/origin/related-task/responsible-party/link/text"
@@ -27548,6 +29720,9 @@
          <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/origin/related-task/subject/description"
@@ -27571,6 +29746,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/subject/link/text"
@@ -27593,6 +29774,9 @@
          <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/origin/related-task/subject/include-all"
@@ -27635,6 +29819,9 @@
          <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/origin/related-task/subject/exclude-subject/link/text"
@@ -27657,6 +29844,9 @@
          <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/origin/related-task/identified-subject"
@@ -27707,6 +29897,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -27729,6 +29925,9 @@
          <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/origin/related-task/identified-subject/subject/include-all"
@@ -27771,6 +29970,9 @@
          <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/origin/related-task/identified-subject/subject/exclude-subject/link/text"
@@ -27793,6 +29995,9 @@
          <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/characterization/link/text"
@@ -27815,6 +30020,9 @@
          <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/characterization/origin/actor/link/text"
@@ -27837,6 +30045,9 @@
          <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/characterization/origin/related-task/link/text"
@@ -27859,6 +30070,9 @@
          <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/characterization/origin/related-task/responsible-party/link/text"
@@ -27881,6 +30095,9 @@
          <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/characterization/origin/related-task/subject/description"
@@ -27904,6 +30121,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/subject/link/text"
@@ -27926,6 +30149,9 @@
          <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/characterization/origin/related-task/subject/include-all"
@@ -27968,6 +30194,9 @@
          <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/characterization/origin/related-task/subject/exclude-subject/link/text"
@@ -27990,6 +30219,9 @@
          <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/characterization/origin/related-task/identified-subject"
@@ -28040,6 +30272,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/identified-subject/subject/link/text"
@@ -28062,6 +30300,9 @@
          <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/characterization/origin/related-task/identified-subject/subject/include-all"
@@ -28104,6 +30345,9 @@
          <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/characterization/origin/related-task/identified-subject/subject/exclude-subject/link/text"
@@ -28126,6 +30370,9 @@
          <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/characterization/facet"
@@ -28181,6 +30428,9 @@
          <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"
@@ -28243,6 +30493,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/mitigating-factor/link/text"
@@ -28265,6 +30521,9 @@
          <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"
@@ -28274,7 +30533,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/risk/mitigating-factor/subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/risk/mitigating-factors/subjects"
                 name="subject-reference"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:subject-reference"
                 _step="subject"
                 _key="subjects"
@@ -28323,6 +30582,9 @@
          <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/mitigating-factor/subject/link/text"
@@ -28345,6 +30607,9 @@
          <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/deadline"
@@ -28367,6 +30632,9 @@
          <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"
@@ -28376,7 +30644,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/risk/response"
                 _metaschema-json-id="/assembly/oscal-assessment-common/risk/remediations"
                 name="response"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:response"
                 _step="response"
                 _key="remediations"
@@ -28447,6 +30715,9 @@
          <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"
@@ -28470,6 +30741,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/link/text"
@@ -28492,6 +30769,9 @@
          <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"
@@ -28514,6 +30794,9 @@
          <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/related-task/link/text"
@@ -28536,6 +30819,9 @@
          <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/related-task/responsible-party/link/text"
@@ -28558,6 +30844,9 @@
          <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/related-task/subject/description"
@@ -28581,6 +30870,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/origin/related-task/subject/link/text"
@@ -28603,6 +30898,9 @@
          <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/related-task/subject/include-all"
@@ -28645,6 +30943,9 @@
          <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/related-task/subject/exclude-subject/link/text"
@@ -28667,6 +30968,9 @@
          <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/related-task/identified-subject"
@@ -28717,6 +31021,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/origin/related-task/identified-subject/subject/link/text"
@@ -28739,6 +31049,9 @@
          <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/related-task/identified-subject/subject/include-all"
@@ -28781,6 +31094,9 @@
          <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/related-task/identified-subject/subject/exclude-subject/link/text"
@@ -28803,6 +31119,9 @@
          <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/required-asset"
@@ -28852,7 +31171,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/response/required-asset/subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/response/required-assets/subjects"
                 name="subject-reference"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:subject-reference"
                 _step="subject"
                 _key="subjects"
@@ -28901,6 +31220,9 @@
          <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/subject/link/text"
@@ -28923,6 +31245,9 @@
          <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/required-asset/title"
@@ -28945,6 +31270,9 @@
          <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"
@@ -28968,6 +31296,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/link/text"
@@ -28990,6 +31324,9 @@
          <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//task/title"
@@ -29012,6 +31349,9 @@
          <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//task/description"
@@ -29035,6 +31375,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/link/text"
@@ -29057,6 +31403,9 @@
          <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//task/timing"
@@ -29228,6 +31577,9 @@
          <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//task/associated-activity/responsible-role/link/text"
@@ -29250,6 +31602,9 @@
          <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//task/associated-activity/subject/description"
@@ -29273,6 +31628,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -29295,6 +31656,9 @@
          <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//task/associated-activity/subject/include-all"
@@ -29337,6 +31701,9 @@
          <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//task/associated-activity/subject/exclude-subject/link/text"
@@ -29359,6 +31726,9 @@
          <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//task/subject/description"
@@ -29382,6 +31752,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/subject/link/text"
@@ -29404,6 +31780,9 @@
          <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//task/subject/include-all"
@@ -29446,6 +31825,9 @@
          <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//task/subject/exclude-subject/link/text"
@@ -29468,6 +31850,9 @@
          <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//task/responsible-role/link/text"
@@ -29490,6 +31875,9 @@
          <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/risk-log"
@@ -29588,6 +31976,9 @@
          <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/risk-log/entry/description"
@@ -29611,6 +32002,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/risk-log/entry/start"
@@ -29633,6 +32030,9 @@
          <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"
@@ -29655,6 +32055,9 @@
          <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/risk/risk-log/entry/link/text"
@@ -29677,6 +32080,9 @@
          <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/risk-log/entry/related-response"
@@ -29737,6 +32143,9 @@
          <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/risk-log/entry/related-response/related-task/link/text"
@@ -29759,6 +32168,9 @@
          <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/risk-log/entry/related-response/related-task/responsible-party/link/text"
@@ -29781,6 +32193,9 @@
          <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/risk-log/entry/related-response/related-task/subject/description"
@@ -29804,6 +32219,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/risk-log/entry/related-response/related-task/subject/link/text"
@@ -29826,6 +32247,9 @@
          <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/risk-log/entry/related-response/related-task/subject/include-all"
@@ -29868,6 +32292,9 @@
          <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/risk-log/entry/related-response/related-task/subject/exclude-subject/link/text"
@@ -29890,6 +32317,9 @@
          <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/risk-log/entry/related-response/related-task/identified-subject"
@@ -29940,6 +32370,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/risk-log/entry/related-response/related-task/identified-subject/subject/link/text"
@@ -29962,6 +32398,9 @@
          <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/risk-log/entry/related-response/related-task/identified-subject/subject/include-all"
@@ -30004,6 +32443,9 @@
          <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/risk-log/entry/related-response/related-task/identified-subject/subject/exclude-subject/link/text"
@@ -30026,6 +32468,9 @@
          <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/related-observation"
@@ -30065,6 +32510,9 @@
          <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/description"
@@ -30088,6 +32536,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/link/text"
@@ -30110,6 +32564,9 @@
          <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/finding/origin/actor/link/text"
@@ -30132,6 +32589,9 @@
          <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/finding/origin/related-task/link/text"
@@ -30154,6 +32614,9 @@
          <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/finding/origin/related-task/responsible-party/link/text"
@@ -30176,6 +32639,9 @@
          <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/finding/origin/related-task/subject/description"
@@ -30199,6 +32665,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/origin/related-task/subject/link/text"
@@ -30221,6 +32693,9 @@
          <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/finding/origin/related-task/subject/include-all"
@@ -30263,6 +32738,9 @@
          <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/finding/origin/related-task/subject/exclude-subject/link/text"
@@ -30285,6 +32763,9 @@
          <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/finding/origin/related-task/identified-subject"
@@ -30335,6 +32816,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/origin/related-task/identified-subject/subject/link/text"
@@ -30357,6 +32844,9 @@
          <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/finding/origin/related-task/identified-subject/subject/include-all"
@@ -30399,6 +32889,9 @@
          <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/finding/origin/related-task/identified-subject/subject/exclude-subject/link/text"
@@ -30421,6 +32914,9 @@
          <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/finding/target/title"
@@ -30443,6 +32939,9 @@
          <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"
@@ -30466,6 +32965,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -30488,51 +32993,32 @@
          <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/finding/target/status"
                  priority="8"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field _step="status"
-             _key="status"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/finding-target/status"
-             _metaschema-json-id="/assembly/oscal-assessment-common/finding-target/status"
-             collapsible="no"
-             as-type="token"
-             name="status"
-             key="status"
-             _using-name="status"
-             _in-xml-name="status"
-             _in-json-name="status"
-             gi="status"
-             in-json="SCALAR">
+      <assembly _step="status"
+                _key="status"
+                _metaschema-xml-id="/assembly/oscal-assessment-common/finding-target/status"
+                _metaschema-json-id="/assembly/oscal-assessment-common/finding-target/status"
+                name="status"
+                key="status"
+                _using-name="status"
+                _in-xml-name="status"
+                _in-json-name="status"
+                gi="status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/finding/target/reason"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field _step="reason"
-             _key="reason"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/finding-target/reason"
-             _metaschema-json-id="/assembly/oscal-assessment-common/finding-target/reason"
-             collapsible="no"
-             as-type="NCName"
-             name="reason"
-             key="reason"
-             _using-name="reason"
-             _in-xml-name="reason"
-             _in-json-name="reason"
-             gi="reason"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">reason</xsl:attribute>
-         </xsl:if>
-      </field>
+         <xsl:apply-templates select="@state"/>
+         <xsl:apply-templates select="@reason"/>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/finding/implementation-statement-uuid"
                  priority="7"
@@ -30554,6 +33040,9 @@
          <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"
@@ -30652,6 +33141,9 @@
          <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/back-matter/resource/description"
@@ -30675,6 +33167,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/back-matter/resource/document-id"
@@ -30686,7 +33184,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -30755,6 +33253,9 @@
          <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/back-matter/resource/citation/link/text"
@@ -30777,6 +33278,9 @@
          <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/back-matter/resource/rlink"
@@ -30849,6 +33353,9 @@
          <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"
@@ -30861,7 +33368,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -30874,6 +33381,9 @@
          <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="plan-of-action-and-milestones/metadata/last-modified"
@@ -30886,7 +33396,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -30899,6 +33409,9 @@
          <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="plan-of-action-and-milestones/metadata/version"
@@ -30911,7 +33424,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -30924,6 +33437,9 @@
          <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="plan-of-action-and-milestones/metadata/oscal-version"
@@ -30936,7 +33452,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -30949,6 +33465,9 @@
          <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="plan-of-action-and-milestones/metadata/revisions/revision"
@@ -30958,7 +33477,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/revisions/revision"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/revisions"
                 name="revision"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:revision"
                 _step="revisions/revision"
                 _key="revisions"
@@ -30998,7 +33517,7 @@
              group-json="ARRAY"
              name="revision"
              key="revisions"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:revision"
              _key-ref="oscal-metadata:revision">
          <xsl:if test="$with-key">
@@ -31027,6 +33546,9 @@
          <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/revisions/revision/published"
@@ -31039,7 +33561,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -31052,6 +33574,9 @@
          <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="plan-of-action-and-milestones/metadata/revisions/revision/last-modified"
@@ -31064,7 +33589,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -31077,6 +33602,9 @@
          <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="plan-of-action-and-milestones/metadata/revisions/revision/version"
@@ -31089,7 +33617,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -31102,6 +33630,9 @@
          <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="plan-of-action-and-milestones/metadata/revisions/revision/oscal-version"
@@ -31114,7 +33645,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -31127,6 +33658,9 @@
          <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="plan-of-action-and-milestones/metadata/revisions/revision/link/text"
@@ -31149,6 +33683,9 @@
          <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/document-id"
@@ -31160,7 +33697,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -31195,6 +33732,9 @@
          <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/role/title"
@@ -31217,6 +33757,9 @@
          <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/role/short-name"
@@ -31239,6 +33782,9 @@
          <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="plan-of-action-and-milestones/metadata/role/description"
@@ -31262,6 +33808,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/role/link/text"
@@ -31284,6 +33836,9 @@
          <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/title"
@@ -31306,6 +33861,9 @@
          <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/location/address"
@@ -31316,7 +33874,7 @@
                 _metaschema-json-id="/assembly/oscal-metadata/location/address"
                 name="address"
                 key="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="address"
@@ -31351,7 +33909,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -31360,7 +33918,11 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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"
@@ -31382,6 +33944,9 @@
          <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="plan-of-action-and-milestones/metadata/location/address/state"
@@ -31404,6 +33969,9 @@
          <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="plan-of-action-and-milestones/metadata/location/address/postal-code"
@@ -31426,6 +33994,9 @@
          <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="plan-of-action-and-milestones/metadata/location/address/country"
@@ -31448,6 +34019,9 @@
          <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="plan-of-action-and-milestones/metadata/location/email-address"
@@ -31459,7 +34033,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -31468,7 +34042,11 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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"
@@ -31479,7 +34057,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -31509,7 +34087,11 @@
              _in-xml-name="url"
              _in-json-name="urls"
              gi="url"
-             in-json="SCALAR"/>
+             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"
@@ -31531,6 +34113,9 @@
          <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/name"
@@ -31553,6 +34138,9 @@
          <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="plan-of-action-and-milestones/metadata/party/short-name"
@@ -31575,6 +34163,9 @@
          <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="plan-of-action-and-milestones/metadata/party/external-id"
@@ -31618,6 +34209,9 @@
          <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/email-address"
@@ -31629,7 +34223,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -31638,7 +34232,11 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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"
@@ -31649,7 +34247,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -31671,7 +34269,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/party/address"
                 _metaschema-json-id="/assembly/oscal-metadata/party/addresses"
                 name="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="addresses"
@@ -31703,7 +34301,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -31712,7 +34310,11 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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"
@@ -31734,6 +34336,9 @@
          <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="plan-of-action-and-milestones/metadata/party/address/state"
@@ -31756,6 +34361,9 @@
          <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="plan-of-action-and-milestones/metadata/party/address/postal-code"
@@ -31778,6 +34386,9 @@
          <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="plan-of-action-and-milestones/metadata/party/address/country"
@@ -31800,6 +34411,9 @@
          <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="plan-of-action-and-milestones/metadata/party/member-of-organization"
@@ -31817,7 +34431,11 @@
              _in-xml-name="member-of-organization"
              _in-json-name="member-of-organizations"
              gi="member-of-organization"
-             in-json="SCALAR"/>
+             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"
@@ -31839,6 +34457,9 @@
          <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/component/title"
@@ -31861,6 +34482,9 @@
          <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/component/description"
@@ -31884,6 +34508,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/component/purpose"
@@ -31906,6 +34536,9 @@
          <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/component/link/text"
@@ -31928,6 +34561,9 @@
          <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/component/status"
@@ -31971,6 +34607,9 @@
          <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/component/protocol/title"
@@ -31993,6 +34632,9 @@
          <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/inventory-item/description"
@@ -32016,6 +34658,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/inventory-item/link/text"
@@ -32038,6 +34686,9 @@
          <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/inventory-item/responsible-party/link/text"
@@ -32060,6 +34711,9 @@
          <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/inventory-item/implemented-component"
@@ -32120,6 +34774,9 @@
          <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/inventory-item/implemented-component/responsible-party/link/text"
@@ -32142,6 +34799,9 @@
          <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/title"
@@ -32164,6 +34824,9 @@
          <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/description"
@@ -32187,6 +34850,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/link/text"
@@ -32209,6 +34878,9 @@
          <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/method"
@@ -32226,7 +34898,11 @@
              _in-xml-name="method"
              _in-json-name="methods"
              gi="method"
-             in-json="SCALAR"/>
+             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"
@@ -32243,7 +34919,11 @@
              _in-xml-name="type"
              _in-json-name="types"
              gi="type"
-             in-json="SCALAR"/>
+             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"
@@ -32265,6 +34945,9 @@
          <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/link/text"
@@ -32287,6 +34970,9 @@
          <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/responsible-party/link/text"
@@ -32309,6 +34995,9 @@
          <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"
@@ -32332,6 +35021,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/origin/related-task/subject/link/text"
@@ -32354,6 +35049,9 @@
          <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/include-all"
@@ -32396,6 +35094,9 @@
          <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/exclude-subject/link/text"
@@ -32418,6 +35119,9 @@
          <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/identified-subject"
@@ -32468,6 +35172,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/origin/related-task/identified-subject/subject/link/text"
@@ -32490,6 +35200,9 @@
          <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/identified-subject/subject/include-all"
@@ -32532,6 +35245,9 @@
          <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/identified-subject/subject/exclude-subject/link/text"
@@ -32554,6 +35270,9 @@
          <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"
@@ -32563,7 +35282,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/observation/subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/observation/subjects"
                 name="subject-reference"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:subject-reference"
                 _step="subject"
                 _key="subjects"
@@ -32612,6 +35331,9 @@
          <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"
@@ -32634,6 +35356,9 @@
          <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"
@@ -32689,6 +35414,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -32711,6 +35442,9 @@
          <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/collected"
@@ -32733,6 +35467,9 @@
          <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"
@@ -32755,6 +35492,9 @@
          <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"
@@ -32777,6 +35517,9 @@
          <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/description"
@@ -32800,6 +35543,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -32823,6 +35572,12 @@
          <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()">
+               <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"
@@ -32845,6 +35600,9 @@
          <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/status"
@@ -32867,6 +35625,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
+         <value as-type="token" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/origin/actor/link/text"
@@ -32889,6 +35650,9 @@
          <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/origin/related-task/link/text"
@@ -32911,6 +35675,9 @@
          <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/origin/related-task/responsible-party/link/text"
@@ -32933,6 +35700,9 @@
          <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/origin/related-task/subject/description"
@@ -32956,6 +35726,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/origin/related-task/subject/link/text"
@@ -32978,6 +35754,9 @@
          <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/origin/related-task/subject/include-all"
@@ -33020,6 +35799,9 @@
          <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/origin/related-task/subject/exclude-subject/link/text"
@@ -33042,6 +35824,9 @@
          <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/origin/related-task/identified-subject"
@@ -33092,6 +35877,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/origin/related-task/identified-subject/subject/link/text"
@@ -33114,6 +35905,9 @@
          <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/origin/related-task/identified-subject/subject/include-all"
@@ -33156,6 +35950,9 @@
          <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/origin/related-task/identified-subject/subject/exclude-subject/link/text"
@@ -33178,6 +35975,9 @@
          <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/link/text"
@@ -33200,6 +36000,9 @@
          <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/actor/link/text"
@@ -33222,6 +36025,9 @@
          <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/link/text"
@@ -33244,6 +36050,9 @@
          <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/responsible-party/link/text"
@@ -33266,6 +36075,9 @@
          <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/subject/description"
@@ -33289,6 +36101,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/characterization/origin/related-task/subject/link/text"
@@ -33311,6 +36129,9 @@
          <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/subject/include-all"
@@ -33353,6 +36174,9 @@
          <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/subject/exclude-subject/link/text"
@@ -33375,6 +36199,9 @@
          <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"
@@ -33425,6 +36252,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/characterization/origin/related-task/identified-subject/subject/link/text"
@@ -33447,6 +36280,9 @@
          <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-all"
@@ -33489,6 +36325,9 @@
          <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"
@@ -33511,6 +36350,9 @@
          <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/facet"
@@ -33566,6 +36408,9 @@
          <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"
@@ -33628,6 +36473,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/mitigating-factor/link/text"
@@ -33650,6 +36501,9 @@
          <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/subject"
@@ -33659,7 +36513,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/risk/mitigating-factor/subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/risk/mitigating-factors/subjects"
                 name="subject-reference"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:subject-reference"
                 _step="subject"
                 _key="subjects"
@@ -33708,6 +36562,9 @@
          <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/mitigating-factor/subject/link/text"
@@ -33730,6 +36587,9 @@
          <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/deadline"
@@ -33752,6 +36612,9 @@
          <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"
@@ -33761,7 +36624,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/risk/response"
                 _metaschema-json-id="/assembly/oscal-assessment-common/risk/remediations"
                 name="response"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:response"
                 _step="response"
                 _key="remediations"
@@ -33832,6 +36695,9 @@
          <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/description"
@@ -33855,6 +36721,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/link/text"
@@ -33877,6 +36749,9 @@
          <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/origin/actor/link/text"
@@ -33899,6 +36774,9 @@
          <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/origin/related-task/link/text"
@@ -33921,6 +36799,9 @@
          <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/origin/related-task/responsible-party/link/text"
@@ -33943,6 +36824,9 @@
          <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/origin/related-task/subject/description"
@@ -33966,6 +36850,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/origin/related-task/subject/link/text"
@@ -33988,6 +36878,9 @@
          <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/origin/related-task/subject/include-all"
@@ -34030,6 +36923,9 @@
          <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/origin/related-task/subject/exclude-subject/link/text"
@@ -34052,6 +36948,9 @@
          <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/origin/related-task/identified-subject"
@@ -34102,6 +37001,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/origin/related-task/identified-subject/subject/link/text"
@@ -34124,6 +37029,9 @@
          <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/origin/related-task/identified-subject/subject/include-all"
@@ -34166,6 +37074,9 @@
          <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/origin/related-task/identified-subject/subject/exclude-subject/link/text"
@@ -34188,6 +37099,9 @@
          <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"
@@ -34237,7 +37151,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/response/required-asset/subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/response/required-assets/subjects"
                 name="subject-reference"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:subject-reference"
                 _step="subject"
                 _key="subjects"
@@ -34286,6 +37200,9 @@
          <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"
@@ -34308,6 +37225,9 @@
          <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"
@@ -34330,6 +37250,9 @@
          <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"
@@ -34353,6 +37276,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/required-asset/link/text"
@@ -34375,6 +37304,9 @@
          <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/title"
@@ -34397,6 +37329,9 @@
          <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"
@@ -34420,6 +37355,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -34442,6 +37383,9 @@
          <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/timing"
@@ -34613,6 +37557,9 @@
          <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/associated-activity/responsible-role/link/text"
@@ -34635,6 +37582,9 @@
          <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/associated-activity/subject/description"
@@ -34658,6 +37608,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/associated-activity/subject/link/text"
@@ -34680,6 +37636,9 @@
          <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/associated-activity/subject/include-all"
@@ -34722,6 +37681,9 @@
          <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/associated-activity/subject/exclude-subject/link/text"
@@ -34744,6 +37706,9 @@
          <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/description"
@@ -34767,6 +37732,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/subject/link/text"
@@ -34789,6 +37760,9 @@
          <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-all"
@@ -34831,6 +37805,9 @@
          <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/exclude-subject/link/text"
@@ -34853,6 +37830,9 @@
          <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/responsible-role/link/text"
@@ -34875,6 +37855,9 @@
          <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"
@@ -34973,6 +37956,9 @@
          <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/risk-log/entry/description"
@@ -34996,6 +37982,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/risk-log/entry/start"
@@ -35018,6 +38010,9 @@
          <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"
@@ -35040,6 +38035,9 @@
          <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"
@@ -35062,6 +38060,9 @@
          <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"
@@ -35122,6 +38123,9 @@
          <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/link/text"
@@ -35144,6 +38148,9 @@
          <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/responsible-party/link/text"
@@ -35166,6 +38173,9 @@
          <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"
@@ -35189,6 +38199,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/risk-log/entry/related-response/related-task/subject/link/text"
@@ -35211,6 +38227,9 @@
          <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/include-all"
@@ -35253,6 +38272,9 @@
          <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/exclude-subject/link/text"
@@ -35275,6 +38297,9 @@
          <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/identified-subject"
@@ -35325,6 +38350,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/risk-log/entry/related-response/related-task/identified-subject/subject/link/text"
@@ -35347,6 +38378,9 @@
          <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/identified-subject/subject/include-all"
@@ -35389,6 +38423,9 @@
          <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/identified-subject/subject/exclude-subject/link/text"
@@ -35411,6 +38448,9 @@
          <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/related-observation"
@@ -35450,6 +38490,9 @@
          <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/poam-item/description"
@@ -35473,6 +38516,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/poam-item/link/text"
@@ -35495,6 +38544,9 @@
          <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/poam-item/origin"
@@ -35539,6 +38591,9 @@
          <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/poam-item/related-observation"
@@ -35637,6 +38692,9 @@
          <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/back-matter/resource/description"
@@ -35660,6 +38718,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/back-matter/resource/document-id"
@@ -35671,7 +38735,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -35740,6 +38804,9 @@
          <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/back-matter/resource/citation/link/text"
@@ -35762,6 +38829,9 @@
          <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/back-matter/resource/rlink"
@@ -35814,6 +38884,15 @@
          </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:math="http://www.w3.org/2005/xpath-functions/math"
diff --git a/json/convert/oscal_component_xml-to-json-converter.xsl b/json/convert/oscal_component_xml-to-json-converter.xsl
index 4b98ea1f59..50824aef71 100644
--- a/json/convert/oscal_component_xml-to-json-converter.xsl
+++ b/json/convert/oscal_component_xml-to-json-converter.xsl
@@ -87,7 +87,7 @@
                 _metaschema-json-id="/assembly/oscal-component-definition/component-definition"
                 name="component-definition"
                 key="component-definition"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:component-definition"
                 _using-root-name="component-definition"
                 gi="component-definition">
@@ -130,7 +130,7 @@
                 _metaschema-json-id="/assembly/oscal-component-definition/component-definition/metadata"
                 name="metadata"
                 key="metadata"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:metadata"
                 _step="metadata"
                 _key="metadata"
@@ -206,7 +206,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/revision/prop"
                 _metaschema-json-id="/assembly/oscal-metadata/revision/props"
                 name="property"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:property"
                 _step="prop"
                 _key="props"
@@ -229,7 +229,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/revision/link"
                 _metaschema-json-id="/assembly/oscal-metadata/revision/links"
                 name="link"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:link"
                 _step="link"
                 _key="links"
@@ -250,7 +250,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/role"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/roles"
                 name="role"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:role"
                 _step="role"
                 _key="roles"
@@ -286,7 +286,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/location"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/locations"
                 name="location"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:location"
                 _step="location"
                 _key="locations"
@@ -342,7 +342,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/party"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/parties"
                 name="party"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:party"
                 _step="party"
                 _key="parties"
@@ -420,7 +420,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/responsible-party"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/responsible-parties"
                 name="responsible-party"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:responsible-party"
                 _step="responsible-party"
                 _key="responsible-parties"
@@ -461,7 +461,7 @@
                 _metaschema-xml-id="/assembly/oscal-component-definition/component-definition/import-component-definition"
                 _metaschema-json-id="/assembly/oscal-component-definition/component-definition/import-component-definitions"
                 name="import-component-definition"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:import-component-definition"
                 _step="import-component-definition"
                 _key="import-component-definitions"
@@ -479,7 +479,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/component-definition/component"
                 _metaschema-json-id="/assembly/oscal-component-definition/component-definition/components"
                 name="defined-component"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:defined-component"
                 _step="component"
                 _key="components"
@@ -537,7 +537,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/defined-component/responsible-role"
                 _metaschema-json-id="/assembly/oscal-component-definition/defined-component/responsible-roles"
                 name="responsible-role"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:responsible-role"
                 _step="responsible-role"
                 _key="responsible-roles"
@@ -577,7 +577,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/defined-component/protocol"
                 _metaschema-json-id="/assembly/oscal-component-definition/defined-component/protocols"
                 name="protocol"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:protocol"
                 _step="protocol"
                 _key="protocols"
@@ -605,7 +605,7 @@
                 _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/port-range"
                 _metaschema-json-id="/assembly/oscal-implementation-common/protocol/port-ranges"
                 name="port-range"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:port-range"
                 _step="port-range"
                 _key="port-ranges"
@@ -625,7 +625,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/control-implementation/set-parameter"
                 _metaschema-json-id="/assembly/oscal-component-definition/control-implementation/set-parameters"
                 name="set-parameter"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:set-parameter"
                 _step="set-parameter"
                 _key="set-parameters"
@@ -651,7 +651,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/component-definition/capability"
                 _metaschema-json-id="/assembly/oscal-component-definition/component-definition/capabilities"
                 name="capability"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:capability"
                 _step="capability"
                 _key="capabilities"
@@ -700,7 +700,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/capability/incorporates-component"
                 _metaschema-json-id="/assembly/oscal-component-definition/capability/incorporates-components"
                 name="incorporates-component"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:incorporates-component"
                 _step="incorporates-component"
                 _key="incorporates-components"
@@ -720,7 +720,7 @@
                 _metaschema-json-id="/assembly/oscal-component-definition/component-definition/back-matter"
                 name="back-matter"
                 key="back-matter"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:back-matter"
                 _step="back-matter"
                 _key="back-matter"
@@ -751,7 +751,7 @@
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:remarks"
              _step="remarks"
              _key="remarks"
@@ -764,6 +764,12 @@
          <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"
@@ -774,7 +780,7 @@
              collapsible="no"
              as-type="uuid"
              name="location-uuid"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:location-uuid"
              _step="location-uuid"
              _key="location-uuids"
@@ -783,7 +789,11 @@
              _in-xml-name="location-uuid"
              _in-json-name="location-uuids"
              gi="location-uuid"
-             in-json="SCALAR"/>
+             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">
@@ -793,7 +803,7 @@
              collapsible="no"
              as-type="uuid"
              name="party-uuid"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:party-uuid"
              _step="party-uuid"
              _key="party-uuids"
@@ -802,7 +812,11 @@
              _in-xml-name="party-uuid"
              _in-json-name="party-uuids"
              gi="party-uuid"
-             in-json="SCALAR"/>
+             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">
@@ -812,7 +826,7 @@
              collapsible="no"
              as-type="string"
              name="hash"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:hash"
              _step="hash"
              _key="hashes"
@@ -971,7 +985,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/link/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -1043,7 +1057,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/address/type"
             name="location-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:location-type"
             _step="type"
             _key="type"
@@ -1184,7 +1198,7 @@
             _metaschema-json-id="/assembly/oscal-component-definition/defined-component/type"
             name="defined-component-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
             _key-name="oscal-component-definition:defined-component-type"
             _step="type"
             _key="type"
@@ -1324,7 +1338,7 @@
             _metaschema-json-id="/assembly/oscal-component-definition/control-implementation/source"
             name="source"
             key="source"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
             _key-name="oscal-implementation-common:source"
             _step="source"
             _key="source"
@@ -1344,7 +1358,7 @@
             _metaschema-json-id="/assembly/oscal-implementation-common/set-parameter/param-id"
             name="param-id"
             key="param-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
             _key-name="oscal-implementation-common:param-id"
             _step="param-id"
             _key="param-id"
@@ -1382,7 +1396,7 @@
             _metaschema-json-id="/assembly/oscal-component-definition/implemented-requirement/control-id"
             name="control-id"
             key="control-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
             _key-name="oscal-catalog-common:control-id"
             _step="control-id"
             _key="control-id"
@@ -1402,7 +1416,7 @@
             _metaschema-json-id="/assembly/oscal-component-definition/statement/statement-id"
             name="statement-id"
             key="statement-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
             _key-name="oscal-implementation-common:statement-id"
             _step="statement-id"
             _key="statement-id"
@@ -1527,7 +1541,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -1582,7 +1596,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -1614,6 +1628,9 @@
          <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="component-definition/metadata/published"
@@ -1626,7 +1643,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -1639,6 +1656,9 @@
          <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="component-definition/metadata/last-modified"
@@ -1651,7 +1671,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -1664,6 +1684,9 @@
          <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="component-definition/metadata/version"
@@ -1676,7 +1699,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -1689,6 +1712,9 @@
          <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="component-definition/metadata/oscal-version"
@@ -1701,7 +1727,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -1714,6 +1740,9 @@
          <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="component-definition/metadata/revisions/revision"
@@ -1723,7 +1752,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/revisions/revision"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/revisions"
                 name="revision"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:revision"
                 _step="revisions/revision"
                 _key="revisions"
@@ -1763,7 +1792,7 @@
              group-json="ARRAY"
              name="revision"
              key="revisions"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:revision"
              _key-ref="oscal-metadata:revision">
          <xsl:if test="$with-key">
@@ -1792,6 +1821,9 @@
          <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="component-definition/metadata/revisions/revision/published"
@@ -1804,7 +1836,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -1817,6 +1849,9 @@
          <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="component-definition/metadata/revisions/revision/last-modified"
@@ -1829,7 +1864,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -1842,6 +1877,9 @@
          <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="component-definition/metadata/revisions/revision/version"
@@ -1854,7 +1892,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -1867,6 +1905,9 @@
          <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="component-definition/metadata/revisions/revision/oscal-version"
@@ -1879,7 +1920,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -1892,6 +1933,9 @@
          <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="component-definition/metadata/revisions/revision/link/text"
@@ -1914,6 +1958,9 @@
          <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/document-id"
@@ -1925,7 +1972,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -1960,6 +2007,9 @@
          <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/role/title"
@@ -1982,6 +2032,9 @@
          <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="component-definition/metadata/role/short-name"
@@ -2004,6 +2057,9 @@
          <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="component-definition/metadata/role/description"
@@ -2027,6 +2083,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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="component-definition/metadata/role/link/text"
@@ -2049,6 +2111,9 @@
          <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/location/title"
@@ -2071,6 +2136,9 @@
          <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="component-definition/metadata/location/address"
@@ -2081,7 +2149,7 @@
                 _metaschema-json-id="/assembly/oscal-metadata/location/address"
                 name="address"
                 key="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="address"
@@ -2116,7 +2184,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -2125,7 +2193,11 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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"
@@ -2147,6 +2219,9 @@
          <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="component-definition/metadata/location/address/state"
@@ -2169,6 +2244,9 @@
          <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="component-definition/metadata/location/address/postal-code"
@@ -2191,6 +2269,9 @@
          <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="component-definition/metadata/location/address/country"
@@ -2213,6 +2294,9 @@
          <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="component-definition/metadata/location/email-address"
@@ -2224,7 +2308,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -2233,7 +2317,11 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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"
@@ -2244,7 +2332,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -2274,7 +2362,11 @@
              _in-xml-name="url"
              _in-json-name="urls"
              gi="url"
-             in-json="SCALAR"/>
+             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"
@@ -2296,6 +2388,9 @@
          <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/party/name"
@@ -2318,6 +2413,9 @@
          <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="component-definition/metadata/party/short-name"
@@ -2340,6 +2438,9 @@
          <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="component-definition/metadata/party/external-id"
@@ -2383,6 +2484,9 @@
          <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/party/email-address"
@@ -2394,7 +2498,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -2403,7 +2507,11 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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"
@@ -2414,7 +2522,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -2436,7 +2544,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/party/address"
                 _metaschema-json-id="/assembly/oscal-metadata/party/addresses"
                 name="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="addresses"
@@ -2468,7 +2576,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -2477,7 +2585,11 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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"
@@ -2499,6 +2611,9 @@
          <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="component-definition/metadata/party/address/state"
@@ -2521,6 +2636,9 @@
          <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="component-definition/metadata/party/address/postal-code"
@@ -2543,6 +2661,9 @@
          <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="component-definition/metadata/party/address/country"
@@ -2565,6 +2686,9 @@
          <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="component-definition/metadata/party/member-of-organization"
@@ -2582,7 +2706,11 @@
              _in-xml-name="member-of-organization"
              _in-json-name="member-of-organizations"
              gi="member-of-organization"
-             in-json="SCALAR"/>
+             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"
@@ -2604,6 +2732,9 @@
          <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/component/title"
@@ -2626,6 +2757,9 @@
          <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="component-definition/component/description"
@@ -2649,6 +2783,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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="component-definition/component/purpose"
@@ -2671,6 +2811,9 @@
          <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="component-definition/component/link/text"
@@ -2693,6 +2836,9 @@
          <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/component/responsible-role/link/text"
@@ -2715,6 +2861,9 @@
          <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/component/protocol/title"
@@ -2737,6 +2886,9 @@
          <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="component-definition/component/control-implementation"
@@ -2746,7 +2898,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/defined-component/control-implementation"
                 _metaschema-json-id="/assembly/oscal-component-definition/defined-component/control-implementations"
                 name="control-implementation"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:control-implementation"
                 _step="control-implementation"
                 _key="control-implementations"
@@ -2809,6 +2961,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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="component-definition/component/control-implementation/link/text"
@@ -2831,6 +2989,9 @@
          <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/component/control-implementation/set-parameter/value"
@@ -2848,7 +3009,11 @@
              _in-xml-name="value"
              _in-json-name="values"
              gi="value"
-             in-json="SCALAR"/>
+             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"
@@ -2857,7 +3022,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/control-implementation/implemented-requirement"
                 _metaschema-json-id="/assembly/oscal-component-definition/control-implementation/implemented-requirements"
                 name="implemented-requirement"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:implemented-requirement"
                 _step="implemented-requirement"
                 _key="implemented-requirements"
@@ -2928,6 +3093,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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="component-definition/component/control-implementation/implemented-requirement/link/text"
@@ -2950,6 +3121,9 @@
          <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/component/control-implementation/implemented-requirement/set-parameter/value"
@@ -2967,7 +3141,11 @@
              _in-xml-name="value"
              _in-json-name="values"
              gi="value"
-             in-json="SCALAR"/>
+             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"
@@ -2989,6 +3167,9 @@
          <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/component/control-implementation/implemented-requirement/statement"
@@ -2998,7 +3179,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/implemented-requirement/statement"
                 _metaschema-json-id="/assembly/oscal-component-definition/implemented-requirement/statements"
                 name="statement"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:statement"
                 _step="statement"
                 _key="statements"
@@ -3055,6 +3236,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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="component-definition/component/control-implementation/implemented-requirement/statement/link/text"
@@ -3077,6 +3264,9 @@
          <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/component/control-implementation/implemented-requirement/statement/responsible-role/link/text"
@@ -3099,6 +3289,9 @@
          <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/capability/description"
@@ -3122,6 +3315,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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="component-definition/capability/link/text"
@@ -3144,6 +3343,9 @@
          <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/capability/incorporates-component/description"
@@ -3167,6 +3369,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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="component-definition/capability/control-implementation"
@@ -3176,7 +3384,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/capability/control-implementation"
                 _metaschema-json-id="/assembly/oscal-component-definition/capability/control-implementations"
                 name="control-implementation"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:control-implementation"
                 _step="control-implementation"
                 _key="control-implementations"
@@ -3239,6 +3447,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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="component-definition/capability/control-implementation/link/text"
@@ -3261,6 +3475,9 @@
          <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/capability/control-implementation/set-parameter/value"
@@ -3278,7 +3495,11 @@
              _in-xml-name="value"
              _in-json-name="values"
              gi="value"
-             in-json="SCALAR"/>
+             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"
@@ -3287,7 +3508,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/control-implementation/implemented-requirement"
                 _metaschema-json-id="/assembly/oscal-component-definition/control-implementation/implemented-requirements"
                 name="implemented-requirement"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:implemented-requirement"
                 _step="implemented-requirement"
                 _key="implemented-requirements"
@@ -3358,6 +3579,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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="component-definition/capability/control-implementation/implemented-requirement/link/text"
@@ -3380,6 +3607,9 @@
          <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/capability/control-implementation/implemented-requirement/set-parameter/value"
@@ -3397,7 +3627,11 @@
              _in-xml-name="value"
              _in-json-name="values"
              gi="value"
-             in-json="SCALAR"/>
+             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"
@@ -3419,6 +3653,9 @@
          <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/capability/control-implementation/implemented-requirement/statement"
@@ -3428,7 +3665,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/implemented-requirement/statement"
                 _metaschema-json-id="/assembly/oscal-component-definition/implemented-requirement/statements"
                 name="statement"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:statement"
                 _step="statement"
                 _key="statements"
@@ -3485,6 +3722,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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="component-definition/capability/control-implementation/implemented-requirement/statement/link/text"
@@ -3507,6 +3750,9 @@
          <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/capability/control-implementation/implemented-requirement/statement/responsible-role/link/text"
@@ -3529,6 +3775,9 @@
          <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/back-matter/resource"
@@ -3593,6 +3842,9 @@
          <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="component-definition/back-matter/resource/description"
@@ -3616,6 +3868,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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="component-definition/back-matter/resource/document-id"
@@ -3627,7 +3885,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -3696,6 +3954,9 @@
          <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/back-matter/resource/citation/link/text"
@@ -3718,6 +3979,9 @@
          <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/back-matter/resource/rlink"
@@ -3770,6 +4034,15 @@
          </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:math="http://www.w3.org/2005/xpath-functions/math"
diff --git a/json/convert/oscal_poam_xml-to-json-converter.xsl b/json/convert/oscal_poam_xml-to-json-converter.xsl
index 568612136a..cbaec95838 100644
--- a/json/convert/oscal_poam_xml-to-json-converter.xsl
+++ b/json/convert/oscal_poam_xml-to-json-converter.xsl
@@ -87,7 +87,7 @@
                 _metaschema-json-id="/assembly/oscal-poam/plan-of-action-and-milestones"
                 name="plan-of-action-and-milestones"
                 key="plan-of-action-and-milestones"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_poam_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_poam_metaschema.xml"
                 _key-name="oscal-poam:plan-of-action-and-milestones"
                 _using-root-name="plan-of-action-and-milestones"
                 gi="plan-of-action-and-milestones">
@@ -133,7 +133,7 @@
                 _metaschema-json-id="/assembly/oscal-poam/plan-of-action-and-milestones/metadata"
                 name="metadata"
                 key="metadata"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:metadata"
                 _step="metadata"
                 _key="metadata"
@@ -209,7 +209,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/revision/prop"
                 _metaschema-json-id="/assembly/oscal-metadata/revision/props"
                 name="property"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:property"
                 _step="prop"
                 _key="props"
@@ -232,7 +232,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/revision/link"
                 _metaschema-json-id="/assembly/oscal-metadata/revision/links"
                 name="link"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:link"
                 _step="link"
                 _key="links"
@@ -253,7 +253,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/role"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/roles"
                 name="role"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:role"
                 _step="role"
                 _key="roles"
@@ -289,7 +289,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/location"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/locations"
                 name="location"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:location"
                 _step="location"
                 _key="locations"
@@ -345,7 +345,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/party"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/parties"
                 name="party"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:party"
                 _step="party"
                 _key="parties"
@@ -423,7 +423,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/responsible-party"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/responsible-parties"
                 name="responsible-party"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:responsible-party"
                 _step="responsible-party"
                 _key="responsible-parties"
@@ -464,7 +464,7 @@
                 _metaschema-json-id="/assembly/oscal-poam/plan-of-action-and-milestones/import-ssp"
                 name="import-ssp"
                 key="import-ssp"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:import-ssp"
                 _step="import-ssp"
                 _key="import-ssp"
@@ -487,7 +487,7 @@
                 _metaschema-json-id="/assembly/oscal-poam/plan-of-action-and-milestones/local-definitions"
                 name="local-definitions"
                 key="local-definitions"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_poam_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_poam_metaschema.xml"
                 _key-name="oscal-poam:local-definitions"
                 _step="local-definitions"
                 _key="local-definitions"
@@ -522,7 +522,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-poam/local-definitions/component"
                 _metaschema-json-id="/assembly/oscal-poam/local-definitions/components"
                 name="system-component"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:system-component"
                 _step="component"
                 _key="components"
@@ -574,7 +574,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/responsible-role"
                 _metaschema-json-id="/assembly/oscal-implementation-common/system-component/responsible-roles"
                 name="responsible-role"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:responsible-role"
                 _step="responsible-role"
                 _key="responsible-roles"
@@ -614,7 +614,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/protocol"
                 _metaschema-json-id="/assembly/oscal-implementation-common/system-component/protocols"
                 name="protocol"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:protocol"
                 _step="protocol"
                 _key="protocols"
@@ -642,7 +642,7 @@
                 _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/port-range"
                 _metaschema-json-id="/assembly/oscal-implementation-common/protocol/port-ranges"
                 name="port-range"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:port-range"
                 _step="port-range"
                 _key="port-ranges"
@@ -662,7 +662,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-poam/local-definitions/inventory-item"
                 _metaschema-json-id="/assembly/oscal-poam/local-definitions/inventory-items"
                 name="inventory-item"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:inventory-item"
                 _step="inventory-item"
                 _key="inventory-items"
@@ -710,7 +710,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-poam/plan-of-action-and-milestones/observation"
                 _metaschema-json-id="/assembly/oscal-poam/plan-of-action-and-milestones/observations"
                 name="observation"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:observation"
                 _step="observation"
                 _key="observations"
@@ -782,7 +782,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/observation/origin"
                 _metaschema-json-id="/assembly/oscal-assessment-common/observation/origins"
                 name="origin"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:origin"
                 _step="origin"
                 _key="origins"
@@ -816,7 +816,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/origin/actor"
                 _metaschema-json-id="/assembly/oscal-assessment-common/origin/actors"
                 name="origin-actor"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:origin-actor"
                 _step="actor"
                 _key="actors"
@@ -850,7 +850,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/origin/related-task"
                 _metaschema-json-id="/assembly/oscal-assessment-common/origin/related-tasks"
                 name="related-task"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:related-task"
                 _step="related-task"
                 _key="related-tasks"
@@ -898,7 +898,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/related-task/subjects"
                 name="assessment-subject"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:assessment-subject"
                 _step="subject"
                 _key="subjects"
@@ -947,7 +947,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-subjects"
                 name="select-subject-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-subject-by-id"
                 _step="include-subject"
                 _key="include-subjects"
@@ -981,7 +981,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/exclude-subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/exclude-subjects"
                 name="select-subject-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-subject-by-id"
                 _step="exclude-subject"
                 _key="exclude-subjects"
@@ -1015,7 +1015,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-poam/plan-of-action-and-milestones/risk"
                 _metaschema-json-id="/assembly/oscal-poam/plan-of-action-and-milestones/risks"
                 name="risk"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:risk"
                 _step="risk"
                 _key="risks"
@@ -1095,7 +1095,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/risk/characterization"
                 _metaschema-json-id="/assembly/oscal-assessment-common/risk/characterizations"
                 name="characterization"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:characterization"
                 _step="characterization"
                 _key="characterizations"
@@ -1134,7 +1134,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/response/task"
                 _metaschema-json-id="/assembly/oscal-assessment-common/response/tasks"
                 name="task"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:task"
                 _step="task"
                 _key="tasks"
@@ -1207,7 +1207,7 @@
                 _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/logged-by"
                 _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/logged-by"
                 name="logged-by"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:logged-by"
                 _step="logged-by"
                 _key="logged-by"
@@ -1226,7 +1226,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-poam/plan-of-action-and-milestones/poam-item"
                 _metaschema-json-id="/assembly/oscal-poam/plan-of-action-and-milestones/poam-items"
                 name="poam-item"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_poam_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_poam_metaschema.xml"
                 _key-name="oscal-poam:poam-item"
                 _step="poam-item"
                 _key="poam-items"
@@ -1283,7 +1283,7 @@
                 _metaschema-json-id="/assembly/oscal-poam/plan-of-action-and-milestones/back-matter"
                 name="back-matter"
                 key="back-matter"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:back-matter"
                 _step="back-matter"
                 _key="back-matter"
@@ -1314,7 +1314,7 @@
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:remarks"
              _step="remarks"
              _key="remarks"
@@ -1327,6 +1327,12 @@
          <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"
@@ -1337,7 +1343,7 @@
              collapsible="no"
              as-type="uuid"
              name="location-uuid"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:location-uuid"
              _step="location-uuid"
              _key="location-uuids"
@@ -1346,7 +1352,11 @@
              _in-xml-name="location-uuid"
              _in-json-name="location-uuids"
              gi="location-uuid"
-             in-json="SCALAR"/>
+             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">
@@ -1356,7 +1366,7 @@
              collapsible="no"
              as-type="uuid"
              name="party-uuid"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:party-uuid"
              _step="party-uuid"
              _key="party-uuids"
@@ -1365,7 +1375,11 @@
              _in-xml-name="party-uuid"
              _in-json-name="party-uuids"
              gi="party-uuid"
-             in-json="SCALAR"/>
+             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">
@@ -1376,7 +1390,7 @@
              as-type="string"
              name="system-id"
              key="system-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
              _key-name="oscal-implementation-common:system-id"
              _step="system-id"
              _key="system-id"
@@ -1402,7 +1416,7 @@
              collapsible="no"
              as-type="uri"
              name="threat-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
              _key-name="oscal-assessment-common:threat-id"
              _step="threat-id"
              _key="threat-ids"
@@ -1427,7 +1441,7 @@
              as-type="token"
              name="risk-status"
              key="status-change"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
              _key-name="oscal-assessment-common:risk-status"
              _step="status-change"
              _key="status-change"
@@ -1440,6 +1454,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status-change</xsl:attribute>
          </xsl:if>
+         <value as-type="token" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
       </field>
    </xsl:template>
    <xsl:template match="hash"
@@ -1450,7 +1467,7 @@
              collapsible="no"
              as-type="string"
              name="hash"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:hash"
              _step="hash"
              _key="hashes"
@@ -1609,7 +1626,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/link/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -1681,7 +1698,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/address/type"
             name="location-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:location-type"
             _step="type"
             _key="type"
@@ -1839,7 +1856,7 @@
             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/type"
             name="system-component-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
             _key-name="oscal-implementation-common:system-component-type"
             _step="type"
             _key="type"
@@ -2116,7 +2133,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/select-subject-by-id/subject-uuid"
             name="subject-uuid"
             key="subject-uuid"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
             _key-name="oscal-assessment-common:subject-uuid"
             _step="subject-uuid"
             _key="subject-uuid"
@@ -2136,7 +2153,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/select-subject-by-id/type"
             name="subject-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
             _key-name="oscal-assessment-common:subject-type"
             _step="type"
             _key="type"
@@ -2174,7 +2191,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/subject-reference/subject-uuid"
             name="subject-uuid"
             key="subject-uuid"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
             _key-name="oscal-assessment-common:subject-uuid"
             _step="subject-uuid"
             _key="subject-uuid"
@@ -2194,7 +2211,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/subject-reference/type"
             name="subject-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
             _key-name="oscal-assessment-common:subject-type"
             _step="type"
             _key="type"
@@ -2764,7 +2781,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -2819,7 +2836,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -2851,6 +2868,9 @@
          <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"
@@ -2863,7 +2883,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -2876,6 +2896,9 @@
          <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="plan-of-action-and-milestones/metadata/last-modified"
@@ -2888,7 +2911,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -2901,6 +2924,9 @@
          <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="plan-of-action-and-milestones/metadata/version"
@@ -2913,7 +2939,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -2926,6 +2952,9 @@
          <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="plan-of-action-and-milestones/metadata/oscal-version"
@@ -2938,7 +2967,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -2951,6 +2980,9 @@
          <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="plan-of-action-and-milestones/metadata/revisions/revision"
@@ -2960,7 +2992,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/revisions/revision"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/revisions"
                 name="revision"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:revision"
                 _step="revisions/revision"
                 _key="revisions"
@@ -3000,7 +3032,7 @@
              group-json="ARRAY"
              name="revision"
              key="revisions"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:revision"
              _key-ref="oscal-metadata:revision">
          <xsl:if test="$with-key">
@@ -3029,6 +3061,9 @@
          <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/revisions/revision/published"
@@ -3041,7 +3076,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -3054,6 +3089,9 @@
          <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="plan-of-action-and-milestones/metadata/revisions/revision/last-modified"
@@ -3066,7 +3104,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -3079,6 +3117,9 @@
          <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="plan-of-action-and-milestones/metadata/revisions/revision/version"
@@ -3091,7 +3132,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -3104,6 +3145,9 @@
          <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="plan-of-action-and-milestones/metadata/revisions/revision/oscal-version"
@@ -3116,7 +3160,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -3129,6 +3173,9 @@
          <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="plan-of-action-and-milestones/metadata/revisions/revision/link/text"
@@ -3151,6 +3198,9 @@
          <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/document-id"
@@ -3162,7 +3212,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -3197,6 +3247,9 @@
          <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/role/title"
@@ -3219,6 +3272,9 @@
          <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/role/short-name"
@@ -3241,6 +3297,9 @@
          <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="plan-of-action-and-milestones/metadata/role/description"
@@ -3264,6 +3323,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/role/link/text"
@@ -3286,6 +3351,9 @@
          <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/title"
@@ -3308,6 +3376,9 @@
          <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/location/address"
@@ -3318,7 +3389,7 @@
                 _metaschema-json-id="/assembly/oscal-metadata/location/address"
                 name="address"
                 key="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="address"
@@ -3353,7 +3424,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -3362,7 +3433,11 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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"
@@ -3384,6 +3459,9 @@
          <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="plan-of-action-and-milestones/metadata/location/address/state"
@@ -3406,6 +3484,9 @@
          <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="plan-of-action-and-milestones/metadata/location/address/postal-code"
@@ -3428,6 +3509,9 @@
          <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="plan-of-action-and-milestones/metadata/location/address/country"
@@ -3450,6 +3534,9 @@
          <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="plan-of-action-and-milestones/metadata/location/email-address"
@@ -3461,7 +3548,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -3470,7 +3557,11 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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"
@@ -3481,7 +3572,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -3511,7 +3602,11 @@
              _in-xml-name="url"
              _in-json-name="urls"
              gi="url"
-             in-json="SCALAR"/>
+             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"
@@ -3533,6 +3628,9 @@
          <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/name"
@@ -3555,6 +3653,9 @@
          <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="plan-of-action-and-milestones/metadata/party/short-name"
@@ -3577,6 +3678,9 @@
          <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="plan-of-action-and-milestones/metadata/party/external-id"
@@ -3620,6 +3724,9 @@
          <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/email-address"
@@ -3631,7 +3738,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -3640,7 +3747,11 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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"
@@ -3651,7 +3762,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -3673,7 +3784,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/party/address"
                 _metaschema-json-id="/assembly/oscal-metadata/party/addresses"
                 name="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="addresses"
@@ -3705,7 +3816,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -3714,7 +3825,11 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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"
@@ -3736,6 +3851,9 @@
          <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="plan-of-action-and-milestones/metadata/party/address/state"
@@ -3758,6 +3876,9 @@
          <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="plan-of-action-and-milestones/metadata/party/address/postal-code"
@@ -3780,6 +3901,9 @@
          <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="plan-of-action-and-milestones/metadata/party/address/country"
@@ -3802,6 +3926,9 @@
          <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="plan-of-action-and-milestones/metadata/party/member-of-organization"
@@ -3819,7 +3946,11 @@
              _in-xml-name="member-of-organization"
              _in-json-name="member-of-organizations"
              gi="member-of-organization"
-             in-json="SCALAR"/>
+             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"
@@ -3841,6 +3972,9 @@
          <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/component/title"
@@ -3863,6 +3997,9 @@
          <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/component/description"
@@ -3886,6 +4023,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/component/purpose"
@@ -3908,6 +4051,9 @@
          <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/component/link/text"
@@ -3930,6 +4076,9 @@
          <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/component/status"
@@ -3973,6 +4122,9 @@
          <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/component/protocol/title"
@@ -3995,6 +4147,9 @@
          <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/inventory-item/description"
@@ -4018,6 +4173,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/inventory-item/link/text"
@@ -4040,6 +4201,9 @@
          <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/inventory-item/responsible-party/link/text"
@@ -4062,6 +4226,9 @@
          <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/inventory-item/implemented-component"
@@ -4122,6 +4289,9 @@
          <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/inventory-item/implemented-component/responsible-party/link/text"
@@ -4144,6 +4314,9 @@
          <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/title"
@@ -4166,6 +4339,9 @@
          <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/description"
@@ -4189,6 +4365,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/link/text"
@@ -4211,6 +4393,9 @@
          <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/method"
@@ -4228,7 +4413,11 @@
              _in-xml-name="method"
              _in-json-name="methods"
              gi="method"
-             in-json="SCALAR"/>
+             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"
@@ -4245,7 +4434,11 @@
              _in-xml-name="type"
              _in-json-name="types"
              gi="type"
-             in-json="SCALAR"/>
+             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"
@@ -4267,6 +4460,9 @@
          <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/link/text"
@@ -4289,6 +4485,9 @@
          <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/responsible-party/link/text"
@@ -4311,6 +4510,9 @@
          <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"
@@ -4334,6 +4536,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/origin/related-task/subject/link/text"
@@ -4356,6 +4564,9 @@
          <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/include-all"
@@ -4398,6 +4609,9 @@
          <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/exclude-subject/link/text"
@@ -4420,6 +4634,9 @@
          <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/identified-subject"
@@ -4470,6 +4687,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/origin/related-task/identified-subject/subject/link/text"
@@ -4492,6 +4715,9 @@
          <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/identified-subject/subject/include-all"
@@ -4534,6 +4760,9 @@
          <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/identified-subject/subject/exclude-subject/link/text"
@@ -4556,6 +4785,9 @@
          <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"
@@ -4565,7 +4797,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/observation/subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/observation/subjects"
                 name="subject-reference"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:subject-reference"
                 _step="subject"
                 _key="subjects"
@@ -4614,6 +4846,9 @@
          <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"
@@ -4636,6 +4871,9 @@
          <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"
@@ -4691,6 +4929,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -4713,6 +4957,9 @@
          <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/collected"
@@ -4735,6 +4982,9 @@
          <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"
@@ -4757,6 +5007,9 @@
          <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"
@@ -4779,6 +5032,9 @@
          <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/description"
@@ -4802,6 +5058,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -4825,6 +5087,12 @@
          <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()">
+               <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"
@@ -4847,6 +5115,9 @@
          <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/status"
@@ -4869,6 +5140,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
+         <value as-type="token" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/origin/actor/link/text"
@@ -4891,6 +5165,9 @@
          <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/origin/related-task/link/text"
@@ -4913,6 +5190,9 @@
          <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/origin/related-task/responsible-party/link/text"
@@ -4935,6 +5215,9 @@
          <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/origin/related-task/subject/description"
@@ -4958,6 +5241,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/origin/related-task/subject/link/text"
@@ -4980,6 +5269,9 @@
          <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/origin/related-task/subject/include-all"
@@ -5022,6 +5314,9 @@
          <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/origin/related-task/subject/exclude-subject/link/text"
@@ -5044,6 +5339,9 @@
          <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/origin/related-task/identified-subject"
@@ -5094,6 +5392,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/origin/related-task/identified-subject/subject/link/text"
@@ -5116,6 +5420,9 @@
          <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/origin/related-task/identified-subject/subject/include-all"
@@ -5158,6 +5465,9 @@
          <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/origin/related-task/identified-subject/subject/exclude-subject/link/text"
@@ -5180,6 +5490,9 @@
          <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/link/text"
@@ -5202,6 +5515,9 @@
          <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/actor/link/text"
@@ -5224,6 +5540,9 @@
          <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/link/text"
@@ -5246,6 +5565,9 @@
          <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/responsible-party/link/text"
@@ -5268,6 +5590,9 @@
          <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/subject/description"
@@ -5291,6 +5616,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/characterization/origin/related-task/subject/link/text"
@@ -5313,6 +5644,9 @@
          <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/subject/include-all"
@@ -5355,6 +5689,9 @@
          <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/subject/exclude-subject/link/text"
@@ -5377,6 +5714,9 @@
          <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"
@@ -5427,6 +5767,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/characterization/origin/related-task/identified-subject/subject/link/text"
@@ -5449,6 +5795,9 @@
          <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-all"
@@ -5491,6 +5840,9 @@
          <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"
@@ -5513,6 +5865,9 @@
          <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/facet"
@@ -5568,6 +5923,9 @@
          <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"
@@ -5630,6 +5988,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/mitigating-factor/link/text"
@@ -5652,6 +6016,9 @@
          <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/subject"
@@ -5661,7 +6028,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/risk/mitigating-factor/subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/risk/mitigating-factors/subjects"
                 name="subject-reference"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:subject-reference"
                 _step="subject"
                 _key="subjects"
@@ -5710,6 +6077,9 @@
          <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/mitigating-factor/subject/link/text"
@@ -5732,6 +6102,9 @@
          <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/deadline"
@@ -5754,6 +6127,9 @@
          <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"
@@ -5763,7 +6139,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/risk/response"
                 _metaschema-json-id="/assembly/oscal-assessment-common/risk/remediations"
                 name="response"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:response"
                 _step="response"
                 _key="remediations"
@@ -5834,6 +6210,9 @@
          <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/description"
@@ -5857,6 +6236,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/link/text"
@@ -5879,6 +6264,9 @@
          <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/origin/actor/link/text"
@@ -5901,6 +6289,9 @@
          <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/origin/related-task/link/text"
@@ -5923,6 +6314,9 @@
          <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/origin/related-task/responsible-party/link/text"
@@ -5945,6 +6339,9 @@
          <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/origin/related-task/subject/description"
@@ -5968,6 +6365,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/origin/related-task/subject/link/text"
@@ -5990,6 +6393,9 @@
          <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/origin/related-task/subject/include-all"
@@ -6032,6 +6438,9 @@
          <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/origin/related-task/subject/exclude-subject/link/text"
@@ -6054,6 +6463,9 @@
          <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/origin/related-task/identified-subject"
@@ -6104,6 +6516,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/origin/related-task/identified-subject/subject/link/text"
@@ -6126,6 +6544,9 @@
          <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/origin/related-task/identified-subject/subject/include-all"
@@ -6168,6 +6589,9 @@
          <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/origin/related-task/identified-subject/subject/exclude-subject/link/text"
@@ -6190,6 +6614,9 @@
          <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"
@@ -6239,7 +6666,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/response/required-asset/subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/response/required-assets/subjects"
                 name="subject-reference"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:subject-reference"
                 _step="subject"
                 _key="subjects"
@@ -6288,6 +6715,9 @@
          <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"
@@ -6310,6 +6740,9 @@
          <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"
@@ -6332,6 +6765,9 @@
          <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"
@@ -6355,6 +6791,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/required-asset/link/text"
@@ -6377,6 +6819,9 @@
          <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/title"
@@ -6399,6 +6844,9 @@
          <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"
@@ -6422,6 +6870,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -6444,6 +6898,9 @@
          <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/timing"
@@ -6615,6 +7072,9 @@
          <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/associated-activity/responsible-role/link/text"
@@ -6637,6 +7097,9 @@
          <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/associated-activity/subject/description"
@@ -6660,6 +7123,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/associated-activity/subject/link/text"
@@ -6682,6 +7151,9 @@
          <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/associated-activity/subject/include-all"
@@ -6724,6 +7196,9 @@
          <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/associated-activity/subject/exclude-subject/link/text"
@@ -6746,6 +7221,9 @@
          <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/description"
@@ -6769,6 +7247,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/subject/link/text"
@@ -6791,6 +7275,9 @@
          <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-all"
@@ -6833,6 +7320,9 @@
          <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/exclude-subject/link/text"
@@ -6855,6 +7345,9 @@
          <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/responsible-role/link/text"
@@ -6877,6 +7370,9 @@
          <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"
@@ -6975,6 +7471,9 @@
          <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/risk-log/entry/description"
@@ -6998,6 +7497,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/risk-log/entry/start"
@@ -7020,6 +7525,9 @@
          <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"
@@ -7042,6 +7550,9 @@
          <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"
@@ -7064,6 +7575,9 @@
          <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"
@@ -7124,6 +7638,9 @@
          <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/link/text"
@@ -7146,6 +7663,9 @@
          <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/responsible-party/link/text"
@@ -7168,6 +7688,9 @@
          <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"
@@ -7191,6 +7714,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/risk-log/entry/related-response/related-task/subject/link/text"
@@ -7213,6 +7742,9 @@
          <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/include-all"
@@ -7255,6 +7787,9 @@
          <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/exclude-subject/link/text"
@@ -7277,6 +7812,9 @@
          <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/identified-subject"
@@ -7327,6 +7865,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/risk-log/entry/related-response/related-task/identified-subject/subject/link/text"
@@ -7349,6 +7893,9 @@
          <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/identified-subject/subject/include-all"
@@ -7391,6 +7938,9 @@
          <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/identified-subject/subject/exclude-subject/link/text"
@@ -7413,6 +7963,9 @@
          <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/related-observation"
@@ -7452,6 +8005,9 @@
          <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/poam-item/description"
@@ -7475,6 +8031,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/poam-item/link/text"
@@ -7497,6 +8059,9 @@
          <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/poam-item/origin"
@@ -7541,6 +8106,9 @@
          <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/poam-item/related-observation"
@@ -7639,6 +8207,9 @@
          <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/back-matter/resource/description"
@@ -7662,6 +8233,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/back-matter/resource/document-id"
@@ -7673,7 +8250,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -7742,6 +8319,9 @@
          <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/back-matter/resource/citation/link/text"
@@ -7764,6 +8344,9 @@
          <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/back-matter/resource/rlink"
@@ -7816,6 +8399,15 @@
          </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:math="http://www.w3.org/2005/xpath-functions/math"
diff --git a/json/convert/oscal_profile_xml-to-json-converter.xsl b/json/convert/oscal_profile_xml-to-json-converter.xsl
index dd7e5fce65..c0de1dede0 100644
--- a/json/convert/oscal_profile_xml-to-json-converter.xsl
+++ b/json/convert/oscal_profile_xml-to-json-converter.xsl
@@ -87,7 +87,7 @@
                 _metaschema-json-id="/assembly/oscal-profile/profile"
                 name="profile"
                 key="profile"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:profile"
                 _using-root-name="profile"
                 gi="profile">
@@ -118,7 +118,7 @@
                 _metaschema-json-id="/assembly/oscal-profile/profile/metadata"
                 name="metadata"
                 key="metadata"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:metadata"
                 _step="metadata"
                 _key="metadata"
@@ -194,7 +194,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/revision/prop"
                 _metaschema-json-id="/assembly/oscal-metadata/revision/props"
                 name="property"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:property"
                 _step="prop"
                 _key="props"
@@ -217,7 +217,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/revision/link"
                 _metaschema-json-id="/assembly/oscal-metadata/revision/links"
                 name="link"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:link"
                 _step="link"
                 _key="links"
@@ -238,7 +238,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/role"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/roles"
                 name="role"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:role"
                 _step="role"
                 _key="roles"
@@ -274,7 +274,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/location"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/locations"
                 name="location"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:location"
                 _step="location"
                 _key="locations"
@@ -330,7 +330,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/party"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/parties"
                 name="party"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:party"
                 _step="party"
                 _key="parties"
@@ -408,7 +408,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/responsible-party"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/responsible-parties"
                 name="responsible-party"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:responsible-party"
                 _step="responsible-party"
                 _key="responsible-parties"
@@ -448,7 +448,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/profile/import"
                 _metaschema-json-id="/assembly/oscal-profile/profile/imports"
                 name="import"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:import"
                 _step="import"
                 _key="imports"
@@ -483,7 +483,7 @@
                 _metaschema-json-id="/assembly/oscal-profile/import/include-all"
                 name="include-all"
                 key="include-all"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:include-all"
                 _step="include-all"
                 _key="include-all"
@@ -504,7 +504,7 @@
                 _metaschema-json-id="/assembly/oscal-profile/profile/merge"
                 name="merge"
                 key="merge"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:merge"
                 _step="merge"
                 _key="merge"
@@ -529,7 +529,7 @@
                 _metaschema-json-id="/assembly/oscal-profile/merge/combine"
                 name="combine"
                 key="combine"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:combine"
                 _step="combine"
                 _key="combine"
@@ -551,7 +551,7 @@
                 _metaschema-json-id="/assembly/oscal-profile/merge/custom"
                 name="custom"
                 key="custom"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:custom"
                 _step="custom"
                 _key="custom"
@@ -585,7 +585,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/custom/group"
                 _metaschema-json-id="/assembly/oscal-profile/custom/groups"
                 name="group"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:group"
                 _step="group"
                 _key="groups"
@@ -647,7 +647,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/group/param"
                 _metaschema-json-id="/assembly/oscal-profile/group/params"
                 name="parameter"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
                 _key-name="oscal-catalog-common:parameter"
                 _step="param"
                 _key="params"
@@ -706,7 +706,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/constraint"
                 _metaschema-json-id="/assembly/oscal-catalog-common/parameter/constraints"
                 name="parameter-constraint"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
                 _key-name="oscal-catalog-common:parameter-constraint"
                 _step="constraint"
                 _key="constraints"
@@ -731,7 +731,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/guideline"
                 _metaschema-json-id="/assembly/oscal-catalog-common/parameter/guidelines"
                 name="parameter-guideline"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
                 _key-name="oscal-catalog-common:parameter-guideline"
                 _step="guideline"
                 _key="guidelines"
@@ -740,7 +740,29 @@
                 _in-xml-name="guideline"
                 _in-json-name="guidelines"
                 gi="guideline">
-         <xsl:apply-templates select=""/>
+         <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                             group-by="true()">
+            <field in-json="SCALAR"
+                   _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+                   _key="prose"
+                   _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
+                   _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 in-json="string"
+                      as-type="markup-multiline"
+                      _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                      _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE">
+                  <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+               </value>
+            </field>
+         </xsl:for-each-group>
       </assembly>
    </xsl:template>
    <xsl:template match="select"
@@ -750,7 +772,7 @@
                 _metaschema-json-id="/assembly/oscal-catalog-common/parameter/select"
                 name="parameter-selection"
                 key="select"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
                 _key-name="oscal-catalog-common:parameter-selection"
                 _step="select"
                 _key="select"
@@ -778,7 +800,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/group/part"
                 _metaschema-json-id="/assembly/oscal-profile/group/parts"
                 name="part"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
                 _key-name="oscal-catalog-common:part"
                 _step="part"
                 _key="parts"
@@ -799,7 +821,29 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:apply-templates select=""/>
+         <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                             group-by="true()">
+            <field in-json="SCALAR"
+                   _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+                   _key="prose"
+                   _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
+                   _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 in-json="string"
+                      as-type="markup-multiline"
+                      _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6/PROSE"
+                      _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE">
+                  <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+               </value>
+            </field>
+         </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()">
@@ -822,7 +866,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/group/insert-controls"
                 _metaschema-json-id="/assembly/oscal-profile/group/insert-controls"
                 name="insert-controls"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:insert-controls"
                 _step="insert-controls"
                 _key="insert-controls"
@@ -856,7 +900,7 @@
                 _metaschema-json-id="/assembly/oscal-profile/profile/modify"
                 name="modify"
                 key="modify"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:modify"
                 _step="modify"
                 _key="modify"
@@ -890,7 +934,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/modify/alter"
                 _metaschema-json-id="/assembly/oscal-profile/modify/alters"
                 name="alter"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:alter"
                 _step="alter"
                 _key="alters"
@@ -923,7 +967,7 @@
                 _metaschema-xml-id="/assembly/oscal-profile/alter/remove"
                 _metaschema-json-id="/assembly/oscal-profile/alter/removes"
                 name="remove"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:remove"
                 _step="remove"
                 _key="removes"
@@ -944,7 +988,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/alter/add"
                 _metaschema-json-id="/assembly/oscal-profile/alter/adds"
                 name="add"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:add"
                 _step="add"
                 _key="adds"
@@ -993,7 +1037,7 @@
                 _metaschema-json-id="/assembly/oscal-profile/profile/back-matter"
                 name="back-matter"
                 key="back-matter"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:back-matter"
                 _step="back-matter"
                 _key="back-matter"
@@ -1024,7 +1068,7 @@
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:remarks"
              _step="remarks"
              _key="remarks"
@@ -1037,6 +1081,12 @@
          <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"
@@ -1047,7 +1097,7 @@
              collapsible="no"
              as-type="uuid"
              name="location-uuid"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:location-uuid"
              _step="location-uuid"
              _key="location-uuids"
@@ -1056,7 +1106,11 @@
              _in-xml-name="location-uuid"
              _in-json-name="location-uuids"
              gi="location-uuid"
-             in-json="SCALAR"/>
+             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">
@@ -1066,7 +1120,7 @@
              collapsible="no"
              as-type="uuid"
              name="party-uuid"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:party-uuid"
              _step="party-uuid"
              _key="party-uuids"
@@ -1075,7 +1129,11 @@
              _in-xml-name="party-uuid"
              _in-json-name="party-uuids"
              gi="party-uuid"
-             in-json="SCALAR"/>
+             in-json="SCALAR">
+         <value as-type="uuid" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
    </xsl:template>
    <xsl:template match="as-is"
                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
@@ -1086,7 +1144,7 @@
              as-type="boolean"
              name="as-is"
              key="as-is"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
              _key-name="oscal-profile:as-is"
              _step="as-is"
              _key="as-is"
@@ -1099,6 +1157,9 @@
          <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="value"
@@ -1109,7 +1170,7 @@
              collapsible="no"
              as-type="string"
              name="parameter-value"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
              _key-name="oscal-catalog-common:parameter-value"
              _step="value"
              _key="values"
@@ -1118,7 +1179,11 @@
              _in-xml-name="value"
              _in-json-name="values"
              gi="value"
-             in-json="SCALAR"/>
+             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">
@@ -1128,7 +1193,7 @@
              collapsible="no"
              as-type="string"
              name="hash"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:hash"
              _step="hash"
              _key="hashes"
@@ -1287,7 +1352,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/link/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -1359,7 +1424,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/address/type"
             name="location-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:location-type"
             _step="type"
             _key="type"
@@ -1483,7 +1548,7 @@
             _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/with-child-controls"
             name="with-child-controls"
             key="with-child-controls"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
             _key-name="oscal-profile:with-child-controls"
             _step="with-child-controls"
             _key="with-child-controls"
@@ -1503,7 +1568,7 @@
             _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/matching/pattern"
             name="pattern"
             key="pattern"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
             _key-name="oscal-profile:pattern"
             _step="pattern"
             _key="pattern"
@@ -1523,7 +1588,7 @@
             _metaschema-json-id="/assembly/oscal-profile/combine/method"
             name="method"
             key="method"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
             _key-name="oscal-profile:method"
             _step="method"
             _key="method"
@@ -1611,7 +1676,7 @@
             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/depends-on"
             name="depends-on"
             key="depends-on"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
             _key-name="oscal-catalog-common:depends-on"
             _step="depends-on"
             _key="depends-on"
@@ -1769,7 +1834,7 @@
             _metaschema-json-id="/assembly/oscal-profile/modify/set-parameters/depends-on"
             name="depends-on"
             key="depends-on"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
             _key-name="oscal-catalog-common:depends-on"
             _step="depends-on"
             _key="depends-on"
@@ -1789,7 +1854,7 @@
             _metaschema-json-id="/assembly/oscal-profile/alter/control-id"
             name="control-id"
             key="control-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
             _key-name="oscal-catalog-common:control-id"
             _step="control-id"
             _key="control-id"
@@ -1964,7 +2029,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -2019,7 +2084,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -2051,6 +2116,9 @@
          <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"
@@ -2063,7 +2131,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -2076,6 +2144,9 @@
          <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"
@@ -2088,7 +2159,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -2101,6 +2172,9 @@
          <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"
@@ -2113,7 +2187,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -2126,6 +2200,9 @@
          <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"
@@ -2138,7 +2215,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -2151,6 +2228,9 @@
          <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"
@@ -2160,7 +2240,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/revisions/revision"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/revisions"
                 name="revision"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:revision"
                 _step="revisions/revision"
                 _key="revisions"
@@ -2200,7 +2280,7 @@
              group-json="ARRAY"
              name="revision"
              key="revisions"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:revision"
              _key-ref="oscal-metadata:revision">
          <xsl:if test="$with-key">
@@ -2229,6 +2309,9 @@
          <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"
@@ -2241,7 +2324,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -2254,6 +2337,9 @@
          <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"
@@ -2266,7 +2352,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -2279,6 +2365,9 @@
          <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"
@@ -2291,7 +2380,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -2304,6 +2393,9 @@
          <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"
@@ -2316,7 +2408,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -2329,6 +2421,9 @@
          <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"
@@ -2351,6 +2446,9 @@
          <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"
@@ -2362,7 +2460,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -2397,6 +2495,9 @@
          <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/title"
@@ -2419,6 +2520,9 @@
          <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"
@@ -2441,6 +2545,9 @@
          <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"
@@ -2464,6 +2571,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -2486,6 +2599,9 @@
          <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/title"
@@ -2508,6 +2624,9 @@
          <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"
@@ -2518,7 +2637,7 @@
                 _metaschema-json-id="/assembly/oscal-metadata/location/address"
                 name="address"
                 key="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="address"
@@ -2553,7 +2672,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -2562,7 +2681,11 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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"
@@ -2584,6 +2707,9 @@
          <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"
@@ -2606,6 +2732,9 @@
          <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"
@@ -2628,6 +2757,9 @@
          <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"
@@ -2650,6 +2782,9 @@
          <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"
@@ -2661,7 +2796,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -2670,7 +2805,11 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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"
@@ -2681,7 +2820,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -2711,7 +2850,11 @@
              _in-xml-name="url"
              _in-json-name="urls"
              gi="url"
-             in-json="SCALAR"/>
+             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"
@@ -2733,6 +2876,9 @@
          <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/name"
@@ -2755,6 +2901,9 @@
          <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"
@@ -2777,6 +2926,9 @@
          <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"
@@ -2820,6 +2972,9 @@
          <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"
@@ -2831,7 +2986,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -2840,7 +2995,11 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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"
@@ -2851,7 +3010,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -2873,7 +3032,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/party/address"
                 _metaschema-json-id="/assembly/oscal-metadata/party/addresses"
                 name="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="addresses"
@@ -2905,7 +3064,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -2914,7 +3073,11 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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"
@@ -2936,6 +3099,9 @@
          <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"
@@ -2958,6 +3124,9 @@
          <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"
@@ -2980,6 +3149,9 @@
          <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"
@@ -3002,6 +3174,9 @@
          <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"
@@ -3019,7 +3194,11 @@
              _in-xml-name="member-of-organization"
              _in-json-name="member-of-organizations"
              gi="member-of-organization"
-             in-json="SCALAR"/>
+             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"
@@ -3041,6 +3220,9 @@
          <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"
@@ -3050,7 +3232,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/import/include-controls"
                 _metaschema-json-id="/assembly/oscal-profile/import/include-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:select-control-by-id"
                 _step="include-controls"
                 _key="include-controls"
@@ -3091,7 +3273,11 @@
              _in-xml-name="with-id"
              _in-json-name="with-ids"
              gi="with-id"
-             in-json="SCALAR"/>
+             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"
@@ -3117,7 +3303,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/import/exclude-controls"
                 _metaschema-json-id="/assembly/oscal-profile/import/exclude-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:select-control-by-id"
                 _step="exclude-controls"
                 _key="exclude-controls"
@@ -3158,7 +3344,11 @@
              _in-xml-name="with-id"
              _in-json-name="with-ids"
              gi="with-id"
-             in-json="SCALAR"/>
+             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"
@@ -3197,6 +3387,9 @@
          <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"
@@ -3219,6 +3412,9 @@
          <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"
@@ -3241,6 +3437,9 @@
          <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"
@@ -3264,6 +3463,12 @@
          <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()">
+               <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"
@@ -3287,6 +3492,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/merge/custom//group/param/constraint/test"
@@ -3326,28 +3537,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
-      </field>
-   </xsl:template>
-   <xsl:template match="profile/merge/custom//group/param/guideline"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _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"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
       </field>
    </xsl:template>
    <xsl:template match="profile/merge/custom//group/param/select/choice"
@@ -3365,7 +3557,11 @@
              _in-xml-name="choice"
              _in-json-name="choice"
              gi="choice"
-             in-json="SCALAR"/>
+             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"
@@ -3387,6 +3583,9 @@
          <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//part/title"
@@ -3409,28 +3608,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
-      </field>
-   </xsl:template>
-   <xsl:template match="profile/merge/custom//group//part"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _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"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl: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//part/link/text"
@@ -3453,6 +3633,9 @@
          <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/insert-controls/include-controls"
@@ -3462,7 +3645,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/insert-controls/include-controls"
                 _metaschema-json-id="/assembly/oscal-profile/insert-controls/include-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:select-control-by-id"
                 _step="include-controls"
                 _key="include-controls"
@@ -3503,7 +3686,11 @@
              _in-xml-name="with-id"
              _in-json-name="with-ids"
              gi="with-id"
-             in-json="SCALAR"/>
+             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"
@@ -3529,7 +3716,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/insert-controls/exclude-controls"
                 _metaschema-json-id="/assembly/oscal-profile/insert-controls/exclude-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:select-control-by-id"
                 _step="exclude-controls"
                 _key="exclude-controls"
@@ -3570,7 +3757,11 @@
              _in-xml-name="with-id"
              _in-json-name="with-ids"
              gi="with-id"
-             in-json="SCALAR"/>
+             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"
@@ -3596,7 +3787,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/insert-controls/include-controls"
                 _metaschema-json-id="/assembly/oscal-profile/insert-controls/include-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:select-control-by-id"
                 _step="include-controls"
                 _key="include-controls"
@@ -3637,7 +3828,11 @@
              _in-xml-name="with-id"
              _in-json-name="with-ids"
              gi="with-id"
-             in-json="SCALAR"/>
+             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"
@@ -3663,7 +3858,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/insert-controls/exclude-controls"
                 _metaschema-json-id="/assembly/oscal-profile/insert-controls/exclude-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:select-control-by-id"
                 _step="exclude-controls"
                 _key="exclude-controls"
@@ -3704,7 +3899,11 @@
              _in-xml-name="with-id"
              _in-json-name="with-ids"
              gi="with-id"
-             in-json="SCALAR"/>
+             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"
@@ -3799,6 +3998,9 @@
          <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/modify/set-parameter/label"
@@ -3821,6 +4023,9 @@
          <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/modify/set-parameter/usage"
@@ -3844,6 +4049,12 @@
          <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()">
+               <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"
@@ -3867,6 +4078,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/modify/set-parameter/constraint/test"
@@ -3906,28 +4123,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
-      </field>
-   </xsl:template>
-   <xsl:template match="profile/modify/set-parameter/guideline"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _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"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
       </field>
    </xsl:template>
    <xsl:template match="profile/modify/set-parameter/select/choice"
@@ -3945,7 +4143,11 @@
              _in-xml-name="choice"
              _in-json-name="choice"
              gi="choice"
-             in-json="SCALAR"/>
+             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/title"
                  priority="8"
@@ -3967,6 +4169,9 @@
          <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/modify/alter/add/param/link/text"
@@ -3989,6 +4194,9 @@
          <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/modify/alter/add/param/label"
@@ -4011,6 +4219,9 @@
          <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/modify/alter/add/param/usage"
@@ -4034,6 +4245,12 @@
          <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()">
+               <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"
@@ -4057,6 +4274,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/modify/alter/add/param/constraint/test"
@@ -4096,28 +4319,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
-      </field>
-   </xsl:template>
-   <xsl:template match="profile/modify/alter/add/param/guideline"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _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"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
       </field>
    </xsl:template>
    <xsl:template match="profile/modify/alter/add/param/select/choice"
@@ -4135,7 +4339,11 @@
              _in-xml-name="choice"
              _in-json-name="choice"
              gi="choice"
-             in-json="SCALAR"/>
+             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"
@@ -4157,6 +4365,9 @@
          <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/modify/alter/add//part/title"
@@ -4179,28 +4390,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
-      </field>
-   </xsl:template>
-   <xsl:template match="profile/modify/alter/add//part"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _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"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl: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/modify/alter/add//part/link/text"
@@ -4223,6 +4415,9 @@
          <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/back-matter/resource"
@@ -4287,6 +4482,9 @@
          <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/back-matter/resource/description"
@@ -4310,6 +4508,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/back-matter/resource/document-id"
@@ -4321,7 +4525,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -4390,6 +4594,9 @@
          <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/back-matter/resource/citation/link/text"
@@ -4412,6 +4619,9 @@
          <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/back-matter/resource/rlink"
@@ -4464,6 +4674,15 @@
          </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:math="http://www.w3.org/2005/xpath-functions/math"
diff --git a/json/convert/oscal_ssp_xml-to-json-converter.xsl b/json/convert/oscal_ssp_xml-to-json-converter.xsl
index 53e7f185fa..684d245c9a 100644
--- a/json/convert/oscal_ssp_xml-to-json-converter.xsl
+++ b/json/convert/oscal_ssp_xml-to-json-converter.xsl
@@ -87,7 +87,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-security-plan"
                 name="system-security-plan"
                 key="system-security-plan"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:system-security-plan"
                 _using-root-name="system-security-plan"
                 gi="system-security-plan">
@@ -113,7 +113,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-security-plan/metadata"
                 name="metadata"
                 key="metadata"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:metadata"
                 _step="metadata"
                 _key="metadata"
@@ -189,7 +189,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/revision/prop"
                 _metaschema-json-id="/assembly/oscal-metadata/revision/props"
                 name="property"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:property"
                 _step="prop"
                 _key="props"
@@ -212,7 +212,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/revision/link"
                 _metaschema-json-id="/assembly/oscal-metadata/revision/links"
                 name="link"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:link"
                 _step="link"
                 _key="links"
@@ -233,7 +233,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/role"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/roles"
                 name="role"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:role"
                 _step="role"
                 _key="roles"
@@ -269,7 +269,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/location"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/locations"
                 name="location"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:location"
                 _step="location"
                 _key="locations"
@@ -325,7 +325,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/party"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/parties"
                 name="party"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:party"
                 _step="party"
                 _key="parties"
@@ -403,7 +403,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/responsible-party"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/responsible-parties"
                 name="responsible-party"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:responsible-party"
                 _step="responsible-party"
                 _key="responsible-parties"
@@ -444,7 +444,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-security-plan/import-profile"
                 name="import-profile"
                 key="import-profile"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:import-profile"
                 _step="import-profile"
                 _key="import-profile"
@@ -467,7 +467,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-security-plan/system-characteristics"
                 name="system-characteristics"
                 key="system-characteristics"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:system-characteristics"
                 _step="system-characteristics"
                 _key="system-characteristics"
@@ -528,7 +528,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/system-information"
                 name="system-information"
                 key="system-information"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:system-information"
                 _step="system-information"
                 _key="system-information"
@@ -570,7 +570,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/security-impact-level"
                 name="security-impact-level"
                 key="security-impact-level"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:security-impact-level"
                 _step="security-impact-level"
                 _key="security-impact-level"
@@ -594,7 +594,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/authorization-boundary"
                 name="authorization-boundary"
                 key="authorization-boundary"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:authorization-boundary"
                 _step="authorization-boundary"
                 _key="authorization-boundary"
@@ -637,7 +637,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ssp/authorization-boundary/diagram"
                 _metaschema-json-id="/assembly/oscal-ssp/authorization-boundary/diagrams"
                 name="diagram"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:diagram"
                 _step="diagram"
                 _key="diagrams"
@@ -673,7 +673,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/network-architecture"
                 name="network-architecture"
                 key="network-architecture"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:network-architecture"
                 _step="network-architecture"
                 _key="network-architecture"
@@ -717,7 +717,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/data-flow"
                 name="data-flow"
                 key="data-flow"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:data-flow"
                 _step="data-flow"
                 _key="data-flow"
@@ -761,7 +761,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-security-plan/system-implementation"
                 name="system-implementation"
                 key="system-implementation"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:system-implementation"
                 _step="system-implementation"
                 _key="system-implementation"
@@ -824,7 +824,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-implementation/user"
                 _metaschema-json-id="/assembly/oscal-ssp/system-implementation/users"
                 name="system-user"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:system-user"
                 _step="user"
                 _key="users"
@@ -874,7 +874,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/authorized-privilege"
                 _metaschema-json-id="/assembly/oscal-implementation-common/system-user/authorized-privileges"
                 name="authorized-privilege"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:authorized-privilege"
                 _step="authorized-privilege"
                 _key="authorized-privileges"
@@ -900,7 +900,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-implementation/component"
                 _metaschema-json-id="/assembly/oscal-ssp/system-implementation/components"
                 name="system-component"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:system-component"
                 _step="component"
                 _key="components"
@@ -952,7 +952,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/responsible-role"
                 _metaschema-json-id="/assembly/oscal-implementation-common/system-component/responsible-roles"
                 name="responsible-role"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:responsible-role"
                 _step="responsible-role"
                 _key="responsible-roles"
@@ -992,7 +992,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/protocol"
                 _metaschema-json-id="/assembly/oscal-implementation-common/system-component/protocols"
                 name="protocol"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:protocol"
                 _step="protocol"
                 _key="protocols"
@@ -1020,7 +1020,7 @@
                 _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/port-range"
                 _metaschema-json-id="/assembly/oscal-implementation-common/protocol/port-ranges"
                 name="port-range"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:port-range"
                 _step="port-range"
                 _key="port-ranges"
@@ -1040,7 +1040,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-implementation/inventory-item"
                 _metaschema-json-id="/assembly/oscal-ssp/system-implementation/inventory-items"
                 name="inventory-item"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:inventory-item"
                 _step="inventory-item"
                 _key="inventory-items"
@@ -1088,7 +1088,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ssp/control-implementation/set-parameter"
                 _metaschema-json-id="/assembly/oscal-ssp/control-implementation/set-parameters"
                 name="set-parameter"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:set-parameter"
                 _step="set-parameter"
                 _key="set-parameters"
@@ -1114,7 +1114,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ssp/statement/by-component"
                 _metaschema-json-id="/assembly/oscal-ssp/statement/by-components"
                 name="by-component"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:by-component"
                 _step="by-component"
                 _key="by-components"
@@ -1180,7 +1180,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/by-component/implementation-status"
                 name="implementation-status"
                 key="implementation-status"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:implementation-status"
                 _step="implementation-status"
                 _key="implementation-status"
@@ -1203,7 +1203,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-security-plan/back-matter"
                 name="back-matter"
                 key="back-matter"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:back-matter"
                 _step="back-matter"
                 _key="back-matter"
@@ -1234,7 +1234,7 @@
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:remarks"
              _step="remarks"
              _key="remarks"
@@ -1247,6 +1247,12 @@
          <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"
@@ -1257,7 +1263,7 @@
              collapsible="no"
              as-type="uuid"
              name="location-uuid"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:location-uuid"
              _step="location-uuid"
              _key="location-uuids"
@@ -1266,7 +1272,11 @@
              _in-xml-name="location-uuid"
              _in-json-name="location-uuids"
              gi="location-uuid"
-             in-json="SCALAR"/>
+             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">
@@ -1276,7 +1286,7 @@
              collapsible="no"
              as-type="uuid"
              name="party-uuid"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:party-uuid"
              _step="party-uuid"
              _key="party-uuids"
@@ -1285,7 +1295,11 @@
              _in-xml-name="party-uuid"
              _in-json-name="party-uuids"
              gi="party-uuid"
-             in-json="SCALAR"/>
+             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">
@@ -1295,7 +1309,7 @@
              collapsible="no"
              as-type="string"
              name="system-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
              _key-name="oscal-implementation-common:system-id"
              _step="system-id"
              _key="system-ids"
@@ -1318,7 +1332,7 @@
              collapsible="no"
              as-type="token"
              name="role-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:role-id"
              _step="role-id"
              _key="role-ids"
@@ -1327,7 +1341,11 @@
              _in-xml-name="role-id"
              _in-json-name="role-ids"
              gi="role-id"
-             in-json="SCALAR"/>
+             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">
@@ -1337,7 +1355,7 @@
              collapsible="no"
              as-type="string"
              name="function-performed"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
              _key-name="oscal-implementation-common:function-performed"
              _step="function-performed"
              _key="functions-performed"
@@ -1346,7 +1364,11 @@
              _in-xml-name="function-performed"
              _in-json-name="functions-performed"
              gi="function-performed"
-             in-json="SCALAR"/>
+             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">
@@ -1356,7 +1378,7 @@
              collapsible="no"
              as-type="string"
              name="hash"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:hash"
              _step="hash"
              _key="hashes"
@@ -1515,7 +1537,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/link/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -1587,7 +1609,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/address/type"
             name="location-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:location-type"
             _step="type"
             _key="type"
@@ -1851,7 +1873,7 @@
             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/type"
             name="system-component-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
             _key-name="oscal-implementation-common:system-component-type"
             _step="type"
             _key="type"
@@ -2026,7 +2048,7 @@
             _metaschema-json-id="/assembly/oscal-implementation-common/set-parameter/param-id"
             name="param-id"
             key="param-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
             _key-name="oscal-implementation-common:param-id"
             _step="param-id"
             _key="param-id"
@@ -2064,7 +2086,7 @@
             _metaschema-json-id="/assembly/oscal-ssp/implemented-requirement/control-id"
             name="control-id"
             key="control-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
             _key-name="oscal-catalog-common:control-id"
             _step="control-id"
             _key="control-id"
@@ -2084,7 +2106,7 @@
             _metaschema-json-id="/assembly/oscal-ssp/statement/statement-id"
             name="statement-id"
             key="statement-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
             _key-name="oscal-implementation-common:statement-id"
             _step="statement-id"
             _key="statement-id"
@@ -2209,7 +2231,7 @@
             _metaschema-json-id="/assembly/oscal-ssp/by-component/export/responsibilities/provided-uuid"
             name="provided-uuid"
             key="provided-uuid"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
             _key-name="oscal-ssp:provided-uuid"
             _step="provided-uuid"
             _key="provided-uuid"
@@ -2247,7 +2269,7 @@
             _metaschema-json-id="/assembly/oscal-ssp/by-component/inherited/provided-uuid"
             name="provided-uuid"
             key="provided-uuid"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
             _key-name="oscal-ssp:provided-uuid"
             _step="provided-uuid"
             _key="provided-uuid"
@@ -2285,7 +2307,7 @@
             _metaschema-json-id="/assembly/oscal-ssp/by-component/satisfied/responsibility-uuid"
             name="responsibility-uuid"
             key="responsibility-uuid"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
             _key-name="oscal-ssp:responsibility-uuid"
             _step="responsibility-uuid"
             _key="responsibility-uuid"
@@ -2341,7 +2363,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -2396,7 +2418,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -2428,6 +2450,9 @@
          <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"
@@ -2440,7 +2465,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -2453,6 +2478,9 @@
          <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"
@@ -2465,7 +2493,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -2478,6 +2506,9 @@
          <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"
@@ -2490,7 +2521,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -2503,6 +2534,9 @@
          <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"
@@ -2515,7 +2549,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -2528,6 +2562,9 @@
          <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"
@@ -2537,7 +2574,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/revisions/revision"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/revisions"
                 name="revision"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:revision"
                 _step="revisions/revision"
                 _key="revisions"
@@ -2577,7 +2614,7 @@
              group-json="ARRAY"
              name="revision"
              key="revisions"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:revision"
              _key-ref="oscal-metadata:revision">
          <xsl:if test="$with-key">
@@ -2606,6 +2643,9 @@
          <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"
@@ -2618,7 +2658,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -2631,6 +2671,9 @@
          <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"
@@ -2643,7 +2686,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -2656,6 +2699,9 @@
          <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"
@@ -2668,7 +2714,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -2681,6 +2727,9 @@
          <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"
@@ -2693,7 +2742,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -2706,6 +2755,9 @@
          <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"
@@ -2728,6 +2780,9 @@
          <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"
@@ -2739,7 +2794,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -2774,6 +2829,9 @@
          <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/role/title"
@@ -2796,6 +2854,9 @@
          <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/role/short-name"
@@ -2818,6 +2879,9 @@
          <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="system-security-plan/metadata/role/description"
@@ -2841,6 +2905,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/role/link/text"
@@ -2863,6 +2933,9 @@
          <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/location/title"
@@ -2885,6 +2958,9 @@
          <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/location/address"
@@ -2895,7 +2971,7 @@
                 _metaschema-json-id="/assembly/oscal-metadata/location/address"
                 name="address"
                 key="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="address"
@@ -2930,7 +3006,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -2939,7 +3015,11 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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"
@@ -2961,6 +3041,9 @@
          <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="system-security-plan/metadata/location/address/state"
@@ -2983,6 +3066,9 @@
          <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="system-security-plan/metadata/location/address/postal-code"
@@ -3005,6 +3091,9 @@
          <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="system-security-plan/metadata/location/address/country"
@@ -3027,6 +3116,9 @@
          <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="system-security-plan/metadata/location/email-address"
@@ -3038,7 +3130,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -3047,7 +3139,11 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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"
@@ -3058,7 +3154,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -3088,7 +3184,11 @@
              _in-xml-name="url"
              _in-json-name="urls"
              gi="url"
-             in-json="SCALAR"/>
+             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"
@@ -3110,6 +3210,9 @@
          <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/name"
@@ -3132,6 +3235,9 @@
          <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="system-security-plan/metadata/party/short-name"
@@ -3154,6 +3260,9 @@
          <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="system-security-plan/metadata/party/external-id"
@@ -3197,6 +3306,9 @@
          <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/email-address"
@@ -3208,7 +3320,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -3217,7 +3329,11 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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"
@@ -3228,7 +3344,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -3250,7 +3366,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/party/address"
                 _metaschema-json-id="/assembly/oscal-metadata/party/addresses"
                 name="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="addresses"
@@ -3282,7 +3398,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -3291,7 +3407,11 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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"
@@ -3313,6 +3433,9 @@
          <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="system-security-plan/metadata/party/address/state"
@@ -3335,6 +3458,9 @@
          <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="system-security-plan/metadata/party/address/postal-code"
@@ -3357,6 +3483,9 @@
          <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="system-security-plan/metadata/party/address/country"
@@ -3379,6 +3508,9 @@
          <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="system-security-plan/metadata/party/member-of-organization"
@@ -3396,7 +3528,11 @@
              _in-xml-name="member-of-organization"
              _in-json-name="member-of-organizations"
              gi="member-of-organization"
-             in-json="SCALAR"/>
+             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"
@@ -3418,6 +3554,9 @@
          <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"
@@ -3440,6 +3579,9 @@
          <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/system-characteristics/system-name-short"
@@ -3462,6 +3604,9 @@
          <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/system-characteristics/description"
@@ -3485,6 +3630,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -3507,6 +3658,9 @@
          <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/date-authorized"
@@ -3519,7 +3673,7 @@
              as-type="date"
              name="date-authorized"
              key="date-authorized"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:date-authorized"
              _step="date-authorized"
              _key="date-authorized"
@@ -3532,6 +3686,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">date-authorized</xsl:attribute>
          </xsl:if>
+         <value as-type="date" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/security-sensitivity-level"
@@ -3554,6 +3711,9 @@
          <xsl:if test="$with-key">
             <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/system-characteristics/system-information/link/text"
@@ -3576,6 +3736,9 @@
          <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"
@@ -3640,6 +3803,9 @@
          <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"
@@ -3663,6 +3829,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -3703,7 +3875,11 @@
              _in-xml-name="information-type-id"
              _in-json-name="information-type-ids"
              gi="information-type-id"
-             in-json="SCALAR"/>
+             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"
@@ -3725,6 +3901,9 @@
          <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/confidentiality-impact"
@@ -3783,6 +3962,9 @@
          <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/confidentiality-impact/base"
@@ -3795,7 +3977,7 @@
              as-type="string"
              name="base"
              key="base"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:base"
              _step="base"
              _key="base"
@@ -3808,6 +3990,9 @@
          <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/system-characteristics/system-information/information-type/confidentiality-impact/selected"
@@ -3820,7 +4005,7 @@
              as-type="string"
              name="selected"
              key="selected"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:selected"
              _step="selected"
              _key="selected"
@@ -3833,6 +4018,9 @@
          <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/system-characteristics/system-information/information-type/confidentiality-impact/adjustment-justification"
@@ -3846,7 +4034,7 @@
              as-type="markup-multiline"
              name="adjustment-justification"
              key="adjustment-justification"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:adjustment-justification"
              _step="adjustment-justification"
              _key="adjustment-justification"
@@ -3859,6 +4047,12 @@
          <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/system-information/information-type/integrity-impact"
@@ -3917,6 +4111,9 @@
          <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/integrity-impact/base"
@@ -3929,7 +4126,7 @@
              as-type="string"
              name="base"
              key="base"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:base"
              _step="base"
              _key="base"
@@ -3942,6 +4139,9 @@
          <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/system-characteristics/system-information/information-type/integrity-impact/selected"
@@ -3954,7 +4154,7 @@
              as-type="string"
              name="selected"
              key="selected"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:selected"
              _step="selected"
              _key="selected"
@@ -3967,6 +4167,9 @@
          <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/system-characteristics/system-information/information-type/integrity-impact/adjustment-justification"
@@ -3980,7 +4183,7 @@
              as-type="markup-multiline"
              name="adjustment-justification"
              key="adjustment-justification"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:adjustment-justification"
              _step="adjustment-justification"
              _key="adjustment-justification"
@@ -3993,6 +4196,12 @@
          <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/system-information/information-type/availability-impact"
@@ -4051,6 +4260,9 @@
          <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/availability-impact/base"
@@ -4063,7 +4275,7 @@
              as-type="string"
              name="base"
              key="base"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:base"
              _step="base"
              _key="base"
@@ -4076,6 +4288,9 @@
          <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/system-characteristics/system-information/information-type/availability-impact/selected"
@@ -4088,7 +4303,7 @@
              as-type="string"
              name="selected"
              key="selected"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:selected"
              _step="selected"
              _key="selected"
@@ -4101,6 +4316,9 @@
          <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/system-characteristics/system-information/information-type/availability-impact/adjustment-justification"
@@ -4114,7 +4332,7 @@
              as-type="markup-multiline"
              name="adjustment-justification"
              key="adjustment-justification"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:adjustment-justification"
              _step="adjustment-justification"
              _key="adjustment-justification"
@@ -4127,6 +4345,12 @@
          <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"
@@ -4149,6 +4373,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">security-objective-confidentiality</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/security-impact-level/security-objective-integrity"
@@ -4171,6 +4398,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">security-objective-integrity</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/security-impact-level/security-objective-availability"
@@ -4193,6 +4423,9 @@
          <xsl:if test="$with-key">
             <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/status"
@@ -4203,7 +4436,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/status"
                 name="status"
                 key="status"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:status"
                 _step="status"
                 _key="status"
@@ -4240,6 +4473,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -4262,6 +4501,9 @@
          <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"
@@ -4285,6 +4527,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/diagram/link/text"
@@ -4307,6 +4555,9 @@
          <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/caption"
@@ -4329,6 +4580,9 @@
          <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/authorization-boundary/diagram/remarks"
@@ -4352,6 +4606,12 @@
          <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="system-security-plan/system-characteristics/authorization-boundary/remarks"
@@ -4375,6 +4635,12 @@
          <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="system-security-plan/system-characteristics/network-architecture/description"
@@ -4398,6 +4664,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/network-architecture/link/text"
@@ -4420,6 +4692,9 @@
          <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/network-architecture/diagram/description"
@@ -4443,6 +4718,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/network-architecture/diagram/link/text"
@@ -4465,6 +4746,9 @@
          <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/network-architecture/diagram/caption"
@@ -4487,6 +4771,9 @@
          <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/diagram/remarks"
@@ -4510,6 +4797,12 @@
          <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="system-security-plan/system-characteristics/data-flow/description"
@@ -4533,6 +4826,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -4555,6 +4854,9 @@
          <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/diagram/description"
@@ -4578,6 +4880,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/diagram/link/text"
@@ -4600,6 +4908,9 @@
          <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/diagram/caption"
@@ -4622,6 +4933,9 @@
          <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/data-flow/diagram/remarks"
@@ -4645,6 +4959,12 @@
          <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="system-security-plan/system-characteristics/responsible-party/link/text"
@@ -4667,6 +4987,9 @@
          <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-implementation/link/text"
@@ -4689,6 +5012,9 @@
          <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-implementation/leveraged-authorization"
@@ -4745,6 +5071,9 @@
          <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-implementation/leveraged-authorization/link/text"
@@ -4767,6 +5096,9 @@
          <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-implementation/leveraged-authorization/party-uuid"
@@ -4789,6 +5121,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">party-uuid</xsl:attribute>
          </xsl:if>
+         <value as-type="uuid" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-implementation/leveraged-authorization/date-authorized"
@@ -4801,7 +5136,7 @@
              as-type="date"
              name="date-authorized"
              key="date-authorized"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:date-authorized"
              _step="date-authorized"
              _key="date-authorized"
@@ -4814,6 +5149,9 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">date-authorized</xsl:attribute>
          </xsl:if>
+         <value as-type="date" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-implementation/user/title"
@@ -4836,6 +5174,9 @@
          <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-implementation/user/short-name"
@@ -4858,6 +5199,9 @@
          <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="system-security-plan/system-implementation/user/description"
@@ -4881,6 +5225,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/user/link/text"
@@ -4903,6 +5253,9 @@
          <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-implementation/user/authorized-privilege/title"
@@ -4925,6 +5278,9 @@
          <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-implementation/user/authorized-privilege/description"
@@ -4948,6 +5304,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/component/title"
@@ -4970,6 +5332,9 @@
          <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-implementation/component/description"
@@ -4993,6 +5358,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/component/purpose"
@@ -5015,6 +5386,9 @@
          <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="system-security-plan/system-implementation/component/link/text"
@@ -5037,6 +5411,9 @@
          <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-implementation/component/status"
@@ -5080,6 +5457,9 @@
          <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-implementation/component/protocol/title"
@@ -5102,6 +5482,9 @@
          <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-implementation/inventory-item/description"
@@ -5125,6 +5508,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/link/text"
@@ -5147,6 +5536,9 @@
          <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-implementation/inventory-item/responsible-party/link/text"
@@ -5169,6 +5561,9 @@
          <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-implementation/inventory-item/implemented-component"
@@ -5229,6 +5624,9 @@
          <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-implementation/inventory-item/implemented-component/responsible-party/link/text"
@@ -5251,6 +5649,9 @@
          <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"
@@ -5261,7 +5662,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-security-plan/control-implementation"
                 name="control-implementation"
                 key="control-implementation"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:control-implementation"
                 _step="control-implementation"
                 _key="control-implementation"
@@ -5311,6 +5712,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/set-parameter/value"
@@ -5328,7 +5735,11 @@
              _in-xml-name="value"
              _in-json-name="values"
              gi="value"
-             in-json="SCALAR"/>
+             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"
@@ -5337,7 +5748,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ssp/control-implementation/implemented-requirement"
                 _metaschema-json-id="/assembly/oscal-ssp/control-implementation/implemented-requirements"
                 name="implemented-requirement"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:implemented-requirement"
                 _step="implemented-requirement"
                 _key="implemented-requirements"
@@ -5413,6 +5824,9 @@
          <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/set-parameter/value"
@@ -5430,7 +5844,11 @@
              _in-xml-name="value"
              _in-json-name="values"
              gi="value"
-             in-json="SCALAR"/>
+             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"
@@ -5452,6 +5870,9 @@
          <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"
@@ -5461,7 +5882,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ssp/implemented-requirement/statement"
                 _metaschema-json-id="/assembly/oscal-ssp/implemented-requirement/statements"
                 name="statement"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:statement"
                 _step="statement"
                 _key="statements"
@@ -5523,6 +5944,9 @@
          <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"
@@ -5545,6 +5969,9 @@
          <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"
@@ -5568,6 +5995,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/link/text"
@@ -5590,6 +6023,9 @@
          <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/set-parameter/value"
@@ -5607,7 +6043,11 @@
              _in-xml-name="value"
              _in-json-name="values"
              gi="value"
-             in-json="SCALAR"/>
+             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"
@@ -5679,6 +6119,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/link/text"
@@ -5701,6 +6147,9 @@
          <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/provided"
@@ -5763,6 +6212,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/provided/link/text"
@@ -5785,6 +6240,9 @@
          <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/provided/responsible-role/link/text"
@@ -5807,6 +6265,9 @@
          <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/responsibility"
@@ -5870,6 +6331,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -5892,6 +6359,9 @@
          <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/responsibility/responsible-role/link/text"
@@ -5914,6 +6384,9 @@
          <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/inherited"
@@ -5976,6 +6449,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/inherited/link/text"
@@ -5998,6 +6477,9 @@
          <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/inherited/responsible-role/link/text"
@@ -6020,6 +6502,9 @@
          <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/satisfied"
@@ -6083,6 +6568,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/satisfied/link/text"
@@ -6105,6 +6596,9 @@
          <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/satisfied/responsible-role/link/text"
@@ -6127,6 +6621,9 @@
          <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/responsible-role/link/text"
@@ -6149,6 +6646,9 @@
          <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"
@@ -6172,6 +6672,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/link/text"
@@ -6194,6 +6700,9 @@
          <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"
@@ -6211,7 +6720,11 @@
              _in-xml-name="value"
              _in-json-name="values"
              gi="value"
-             in-json="SCALAR"/>
+             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"
@@ -6283,6 +6796,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/link/text"
@@ -6305,6 +6824,9 @@
          <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/export/provided"
@@ -6367,6 +6889,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/provided/link/text"
@@ -6389,6 +6917,9 @@
          <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/export/provided/responsible-role/link/text"
@@ -6411,6 +6942,9 @@
          <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/export/responsibility"
@@ -6474,6 +7008,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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"
@@ -6496,6 +7036,9 @@
          <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/export/responsibility/responsible-role/link/text"
@@ -6518,6 +7061,9 @@
          <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"
@@ -6580,6 +7126,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/inherited/link/text"
@@ -6602,6 +7154,9 @@
          <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"
@@ -6624,6 +7179,9 @@
          <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/satisfied"
@@ -6687,6 +7245,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/satisfied/link/text"
@@ -6709,6 +7273,9 @@
          <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/satisfied/responsible-role/link/text"
@@ -6731,6 +7298,9 @@
          <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/responsible-role/link/text"
@@ -6753,6 +7323,9 @@
          <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"
@@ -6817,6 +7390,9 @@
          <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"
@@ -6840,6 +7416,12 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
+         <value as-type="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/back-matter/resource/document-id"
@@ -6851,7 +7433,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -6920,6 +7502,9 @@
          <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"
@@ -6942,6 +7527,9 @@
          <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"
@@ -6994,6 +7582,15 @@
          </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:math="http://www.w3.org/2005/xpath-functions/math"
diff --git a/json/schema/oscal_assessment-plan_schema.json b/json/schema/oscal_assessment-plan_schema.json
index 8368eceb13..1ef46eadc4 100644
--- a/json/schema/oscal_assessment-plan_schema.json
+++ b/json/schema/oscal_assessment-plan_schema.json
@@ -3,2777 +3,2779 @@
     "$id" : "http://csrc.nist.gov/ns/oscal/1.0.0/oscal-ap-schema.json",
     "$comment" : "OSCAL Assessment Plan Model: JSON Schema",
     "type" : "object",
-    "definitions" :
-    { "oscal-ap-oscal-ap:assessment-plan" :
+    "definitions" : 
+    { "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Assessment Plan Universally Unique Identifier",
             "description" : "Uniquely identifies this assessment plan. This UUID must be changed each time the content of the plan changes.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "metadata" :
+          "metadata" : 
           { "$ref" : "#assembly_oscal-metadata_metadata" },
-          "import-ssp" :
+          "import-ssp" : 
           { "$ref" : "#assembly_oscal-assessment-common_import-ssp" },
-          "local-definitions" :
+          "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" :
+            "properties" : 
+            { "components" : 
               { "type" : "array",
                 "minItems" : 1,
-                "items" :
+                "items" : 
                 { "$ref" : "#assembly_oscal-implementation-common_system-component" } },
-              "inventory-items" :
+              "inventory-items" : 
               { "type" : "array",
                 "minItems" : 1,
-                "items" :
+                "items" : 
                 { "$ref" : "#assembly_oscal-implementation-common_inventory-item" } },
-              "users" :
+              "users" : 
               { "type" : "array",
                 "minItems" : 1,
-                "items" :
+                "items" : 
                 { "$ref" : "#assembly_oscal-implementation-common_system-user" } },
-              "objectives-and-methods" :
+              "objectives-and-methods" : 
               { "type" : "array",
                 "minItems" : 1,
-                "items" :
+                "items" : 
                 { "$ref" : "#assembly_oscal-assessment-common_local-objective" } },
-              "activities" :
+              "activities" : 
               { "type" : "array",
                 "minItems" : 1,
-                "items" :
+                "items" : 
                 { "$ref" : "#assembly_oscal-assessment-common_activity" } },
-              "remarks" :
+              "remarks" : 
               { "$ref" : "#field_oscal-metadata_remarks" } },
             "additionalProperties" : false },
-          "terms-and-conditions" :
+          "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" :
+            "properties" : 
+            { "parts" : 
               { "type" : "array",
                 "minItems" : 1,
-                "items" :
+                "items" : 
                 { "$ref" : "#assembly_oscal-assessment-common_assessment-part" } } },
             "additionalProperties" : false },
-          "reviewed-controls" :
+          "reviewed-controls" : 
           { "$ref" : "#assembly_oscal-assessment-common_reviewed-controls" },
-          "assessment-subjects" :
+          "assessment-subjects" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
-          "assessment-assets" :
+          "assessment-assets" : 
           { "$ref" : "#assembly_oscal-assessment-common_assessment-assets" },
-          "tasks" :
+          "tasks" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_task" } },
-          "back-matter" :
+          "back-matter" : 
           { "$ref" : "#assembly_oscal-metadata_back-matter" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "metadata",
           "import-ssp",
           "reviewed-controls" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-metadata:metadata" :
+      "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" :
+        "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" :
+          "published" : 
           { "$ref" : "#field_oscal-metadata_published" },
-          "last-modified" :
+          "last-modified" : 
           { "$ref" : "#field_oscal-metadata_last-modified" },
-          "version" :
+          "version" : 
           { "$ref" : "#field_oscal-metadata_version" },
-          "oscal-version" :
+          "oscal-version" : 
           { "$ref" : "#field_oscal-metadata_oscal-version" },
-          "revisions" :
+          "revisions" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_revision" } },
-          "document-ids" :
+          "document-ids" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-metadata_document-id" } },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "roles" :
+          "roles" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_role" } },
-          "locations" :
+          "locations" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_location" } },
-          "parties" :
+          "parties" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_party" } },
-          "responsible-parties" :
+          "responsible-parties" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "title",
           "last-modified",
           "version",
           "oscal-version" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-metadata:revision" :
+      "oscal-ap-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" :
+        "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" :
+          "published" : 
           { "$ref" : "#field_oscal-metadata_published" },
-          "last-modified" :
+          "last-modified" : 
           { "$ref" : "#field_oscal-metadata_last-modified" },
-          "version" :
+          "version" : 
           { "$ref" : "#field_oscal-metadata_version" },
-          "oscal-version" :
+          "oscal-version" : 
           { "$ref" : "#field_oscal-metadata_oscal-version" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
         "additionalProperties" : false },
-      "oscal-ap-oscal-metadata:location" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Location Universally Unique Identifier",
             "description" : "A unique identifier that can be used to reference this defined location elsewhere in an OSCAL document. A UUID should be consistently used for a given location across revisions of the document.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "title" :
+          "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" :
+          "address" : 
           { "$ref" : "#assembly_oscal-metadata_address" },
-          "email-addresses" :
+          "email-addresses" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-metadata_email-address" } },
-          "telephone-numbers" :
+          "telephone-numbers" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-metadata_telephone-number" } },
-          "urls" :
+          "urls" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Location URL",
               "description" : "The uniform resource locator (URL) for a web site or Internet presence associated with the location.",
               "type" : "string",
               "format" : "uri" } },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "address" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-metadata:location-uuid" :
+      "oscal-ap-oscal-metadata:location-uuid" : 
       { "title" : "Location Reference",
         "description" : "References a location defined in metadata.",
         "$id" : "#field_oscal-metadata_location-uuid",
         "type" : "string",
         "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-      "oscal-ap-oscal-metadata:party" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Party Universally Unique Identifier",
             "description" : "A unique identifier that can be used to reference this defined location elsewhere in an OSCAL document. A UUID should be consistently used for a given party across revisions of the document.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "type" :
+          "type" : 
           { "title" : "Party Type",
             "description" : "A category describing the kind of party the object describes.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$",
-            "enum" :
+            "enum" : 
             [ "person",
               "organization" ] },
-          "name" :
+          "name" : 
           { "title" : "Party Name",
             "description" : "The full name of the party. This is typically the legal name associated with the party.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "short-name" :
+          "short-name" : 
           { "title" : "Party Short Name",
             "description" : "A short common name, abbreviation, or acronym for the party.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "external-ids" :
+          "external-ids" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "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" :
+              "properties" : 
+              { "scheme" : 
                 { "title" : "External Identifier Schema",
                   "description" : "Indicates the type of external identifier.",
                   "type" : "string",
                   "format" : "uri" },
-                "id" :
+                "id" : 
                 { "type" : "string" } },
-              "required" :
+              "required" : 
               [ "id",
                 "scheme" ],
               "additionalProperties" : false } },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "email-addresses" :
+          "email-addresses" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-metadata_email-address" } },
-          "telephone-numbers" :
+          "telephone-numbers" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-metadata_telephone-number" } },
-          "addresses" :
+          "addresses" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_address" } },
-          "location-uuids" :
+          "location-uuids" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-metadata_location-uuid" } },
-          "member-of-organizations" :
+          "member-of-organizations" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Organizational Affiliation",
               "description" : "Identifies that the party object is a member of the organization associated with the provided UUID.",
               "type" : "string",
               "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "type" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-metadata:party-uuid" :
+      "oscal-ap-oscal-metadata:party-uuid" : 
       { "title" : "Party Reference",
         "description" : "References a party defined in metadata.",
         "$id" : "#field_oscal-metadata_party-uuid",
         "type" : "string",
         "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-      "oscal-ap-oscal-metadata:role" :
+      "oscal-ap-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" :
+        "properties" : 
+        { "id" : 
           { "title" : "Role Identifier",
             "description" : "A unique identifier for a specific role instance. This identifier's uniqueness is document scoped and is intended to be consistent for the same role across minor revisions of the document.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "title" :
+          "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" :
+          "short-name" : 
           { "title" : "Role Short Name",
             "description" : "A short common name, abbreviation, or acronym for the role.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "description" :
+          "description" : 
           { "title" : "Role Description",
             "description" : "A summary of the role's purpose and associated responsibilities.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "id",
           "title" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-metadata:role-id" :
+      "oscal-ap-oscal-metadata:role-id" : 
       { "title" : "Role Identifier Reference",
         "description" : "A reference to the roles served by the user.",
         "$id" : "#field_oscal-metadata_role-id",
         "type" : "string",
         "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-      "oscal-ap-oscal-metadata:back-matter" :
+      "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" :
+        "properties" : 
+        { "resources" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "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" :
+              "properties" : 
+              { "uuid" : 
                 { "title" : "Resource Universally Unique Identifier",
                   "description" : "A globally unique identifier that can be used to reference this defined resource elsewhere in an OSCAL document. A UUID should be consistently used for a given resource across revisions of the document.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "title" :
+                "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" :
+                "description" : 
                 { "title" : "Resource Description",
                   "description" : "A short summary of the resource used to indicate the purpose of the resource.",
                   "type" : "string" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "document-ids" :
+                "document-ids" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#field_oscal-metadata_document-id" } },
-                "citation" :
+                "citation" : 
                 { "title" : "Citation",
                   "description" : "A citation consisting of end note text and optional structured bibliographic data.",
                   "type" : "object",
-                  "properties" :
-                  { "text" :
+                  "properties" : 
+                  { "text" : 
                     { "title" : "Citation Text",
                       "description" : "A line of citation text.",
                       "type" : "string" },
-                    "props" :
+                    "props" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "$ref" : "#assembly_oscal-metadata_property" } },
-                    "links" :
+                    "links" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "$ref" : "#assembly_oscal-metadata_link" } } },
-                  "required" :
+                  "required" : 
                   [ "text" ],
                   "additionalProperties" : false },
-                "rlinks" :
+                "rlinks" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "title" : "Resource link",
                     "description" : "A pointer to an external resource with an optional hash for verification and change detection.",
                     "type" : "object",
-                    "properties" :
-                    { "href" :
+                    "properties" : 
+                    { "href" : 
                       { "title" : "Hypertext Reference",
                         "description" : "A resolvable URI reference to a resource.",
                         "type" : "string",
                         "format" : "uri-reference" },
-                      "media-type" :
+                      "media-type" : 
                       { "title" : "Media Type",
                         "description" : "Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry.",
                         "type" : "string",
                         "pattern" : "^\\S(.*\\S)?$" },
-                      "hashes" :
+                      "hashes" : 
                       { "type" : "array",
                         "minItems" : 1,
-                        "items" :
+                        "items" : 
                         { "$ref" : "#field_oscal-metadata_hash" } } },
-                    "required" :
+                    "required" : 
                     [ "href" ],
                     "additionalProperties" : false } },
-                "base64" :
+                "base64" : 
                 { "title" : "Base64",
                   "description" : "The Base64 alphabet in RFC 2045 - aligned with XSD.",
                   "type" : "object",
-                  "properties" :
-                  { "filename" :
+                  "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.",
                       "type" : "string",
                       "format" : "uri-reference" },
-                    "media-type" :
+                    "media-type" : 
                     { "title" : "Media Type",
                       "description" : "Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry.",
                       "type" : "string",
                       "pattern" : "^\\S(.*\\S)?$" },
-                    "value" :
+                    "value" : 
                     { "type" : "string" } },
-                  "required" :
+                  "required" : 
                   [ "value" ],
                   "additionalProperties" : false },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "uuid" ],
               "additionalProperties" : false } } },
         "additionalProperties" : false },
-      "oscal-ap-oscal-metadata:property" :
+      "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" :
+        "properties" : 
+        { "name" : 
           { "title" : "Property Name",
             "description" : "A textual label that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "uuid" :
+          "uuid" : 
           { "title" : "Property Universally Unique Identifier",
             "description" : "A unique identifier that can be used to reference this property elsewhere in an OSCAL document. A UUID should be consistently used for a given location across revisions of the document.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "ns" :
+          "ns" : 
           { "title" : "Property Namespace",
             "description" : "A namespace qualifying the property's name. This allows different organizations to associate distinct semantics with the same name.",
             "type" : "string",
             "format" : "uri" },
-          "value" :
+          "value" : 
           { "title" : "Property Value",
             "description" : "Indicates the value of the attribute, characteristic, or quality.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "class" :
+          "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.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "name",
           "value" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-metadata:link" :
+      "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" :
+        "properties" : 
+        { "href" : 
           { "title" : "Hypertext Reference",
             "description" : "A resolvable URL reference to a resource.",
             "type" : "string",
             "format" : "uri-reference" },
-          "rel" :
+          "rel" : 
           { "title" : "Relation",
             "description" : "Describes the type of relationship provided by the link. This can be an indicator of the link's purpose.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "media-type" :
+          "media-type" : 
           { "title" : "Media Type",
             "description" : "Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "text" :
+          "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" :
+        "required" : 
         [ "href" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-metadata:responsible-party" :
+      "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" :
+        "properties" : 
+        { "role-id" : 
           { "title" : "Responsible Role",
             "description" : "The role that the party is responsible for.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "party-uuids" :
+          "party-uuids" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-metadata_party-uuid" } },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "role-id",
           "party-uuids" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-metadata:responsible-role" :
+      "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" :
+        "properties" : 
+        { "role-id" : 
           { "title" : "Responsible Role ID",
             "description" : "The role that is responsible for the business function.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "party-uuids" :
+          "party-uuids" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-metadata_party-uuid" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "role-id" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-metadata:hash" :
+      "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" :
+        "properties" : 
+        { "algorithm" : 
           { "title" : "Hash algorithm",
             "description" : "Method by which a hash is derived",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "value" :
+          "value" : 
           { "type" : "string" } },
-        "required" :
+        "required" : 
         [ "value",
           "algorithm" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-metadata:remarks" :
+      "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" :
+      "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",
         "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-9]{2}:[0-9]{2})$" },
-      "oscal-ap-oscal-metadata:last-modified" :
+      "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",
         "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-9]{2}:[0-9]{2})$" },
-      "oscal-ap-oscal-metadata:version" :
+      "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",
         "type" : "string",
         "pattern" : "^\\S(.*\\S)?$" },
-      "oscal-ap-oscal-metadata:oscal-version" :
+      "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",
         "type" : "string",
         "pattern" : "^\\S(.*\\S)?$" },
-      "oscal-ap-oscal-metadata:email-address" :
+      "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",
         "type" : "string",
         "format" : "email",
         "pattern" : "^.+@.+" },
-      "oscal-ap-oscal-metadata:telephone-number" :
+      "oscal-ap-oscal-metadata:telephone-number" : 
       { "title" : "Telephone Number",
         "description" : "Contact number by telephone.",
         "$id" : "#field_oscal-metadata_telephone-number",
         "type" : "object",
-        "properties" :
-        { "type" :
+        "properties" : 
+        { "type" : 
           { "title" : "type flag",
             "description" : "Indicates the type of phone number.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "number" :
+          "number" : 
           { "type" : "string" } },
-        "required" :
+        "required" : 
         [ "number" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-metadata:address" :
+      "oscal-ap-oscal-metadata:address" : 
       { "title" : "Address",
         "description" : "A postal address for the location.",
         "$id" : "#assembly_oscal-metadata_address",
         "type" : "object",
-        "properties" :
-        { "type" :
+        "properties" : 
+        { "type" : 
           { "title" : "Address Type",
             "description" : "Indicates the type of address.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "addr-lines" :
+          "addr-lines" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-metadata_addr-line" } },
-          "city" :
+          "city" : 
           { "title" : "City",
             "description" : "City, town or geographical region for the mailing address.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "state" :
+          "state" : 
           { "title" : "State",
             "description" : "State, province or analogous geographical region for mailing address",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "postal-code" :
+          "postal-code" : 
           { "title" : "Postal Code",
             "description" : "Postal or ZIP code for mailing address",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "country" :
+          "country" : 
           { "title" : "Country Code",
             "description" : "The ISO 3166-1 alpha-2 country code for the mailing address.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" } },
         "additionalProperties" : false },
-      "oscal-ap-oscal-metadata:addr-line" :
+      "oscal-ap-oscal-metadata:addr-line" : 
       { "title" : "Address line",
         "description" : "A single line of an address.",
         "$id" : "#field_oscal-metadata_addr-line",
         "type" : "string",
         "pattern" : "^\\S(.*\\S)?$" },
-      "oscal-ap-oscal-metadata:document-id" :
+      "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 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" :
+        "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.",
             "type" : "string",
             "format" : "uri" },
-          "identifier" :
+          "identifier" : 
           { "type" : "string" } },
-        "required" :
+        "required" : 
         [ "identifier" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:import-ssp" :
+      "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" :
+        "properties" : 
+        { "href" : 
           { "title" : "System Security Plan Reference",
             "description" : ">A resolvable URL reference to the system security plan for the system being assessed.",
             "type" : "string",
             "format" : "uri-reference" },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "href" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:local-objective" :
+      "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" :
+        "properties" : 
+        { "control-id" : 
           { "title" : "Control Identifier Reference",
             "description" : "A reference to a control with a corresponding id value.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "description" :
+          "description" : 
           { "title" : "Objective Description",
             "description" : "A human-readable description of this control objective.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "parts" :
+          "parts" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-catalog-common_part" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "control-id",
           "parts" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:assessment-method" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Assessment Method Universally Unique Identifier",
             "description" : "Uniquely identifies this defined assessment method. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. A UUID should be consistently used for a given assessment method across revisions of the document.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "description" :
+          "description" : 
           { "title" : "Assessment Method Description",
             "description" : "A human-readable description of this assessment method.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "part" :
+          "part" : 
           { "$ref" : "#assembly_oscal-assessment-common_assessment-part" },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "part" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:activity" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Assessment Activity Universally Unique Identifier",
             "description" : "Uniquely identifies this assessment activity. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. A UUID should be consistently used for a given included activity across revisions of the document.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "title" :
+          "title" : 
           { "title" : "Included Activity Title",
             "description" : "The title for this included activity.",
             "type" : "string" },
-          "description" :
+          "description" : 
           { "title" : "Included Activity Description",
             "description" : "A human-readable description of this included activity.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "steps" :
+          "steps" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "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" :
+              "properties" : 
+              { "uuid" : 
                 { "title" : "Step Universally Unique Identifier",
                   "description" : "Uniquely identifies a step. This UUID may be referenced elsewhere in an OSCAL document when referring to this step. A UUID should be consistently used for a given test step across revisions of the document.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "title" :
+                "title" : 
                 { "title" : "Step Title",
                   "description" : "The title for this step.",
                   "type" : "string" },
-                "description" :
+                "description" : 
                 { "title" : "Step Description",
                   "description" : "A human-readable description of this step.",
                   "type" : "string" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "reviewed-controls" :
+                "reviewed-controls" : 
                 { "$ref" : "#assembly_oscal-assessment-common_reviewed-controls" },
-                "responsible-roles" :
+                "responsible-roles" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "uuid",
                 "description" ],
               "additionalProperties" : false } },
-          "related-controls" :
+          "related-controls" : 
           { "$ref" : "#assembly_oscal-assessment-common_reviewed-controls" },
-          "responsible-roles" :
+          "responsible-roles" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "description" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:task" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Task Universally Unique Identifier",
             "description" : "Uniquely identifies this assessment task.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "type" :
+          "type" : 
           { "title" : "Task Type",
             "description" : "The type of task.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "title" :
+          "title" : 
           { "title" : "Task Title",
             "description" : "The title for this task.",
             "type" : "string" },
-          "description" :
+          "description" : 
           { "title" : "Task Description",
             "description" : "A human-readable description of this task.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "timing" :
+          "timing" : 
           { "title" : "Event Timing",
             "description" : "The timing under which the task is intended to occur.",
             "type" : "object",
-            "properties" :
-            { "on-date" :
+            "properties" : 
+            { "on-date" : 
               { "title" : "On Date Condition",
                 "description" : "The task is intended to occur on the specified date.",
                 "type" : "object",
-                "properties" :
-                { "date" :
+                "properties" : 
+                { "date" : 
                   { "title" : "On Date Condition",
                     "description" : "The task must occur on the specified date.",
                     "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-9]{2}:[0-9]{2})$" } },
-                "required" :
+                "required" : 
                 [ "date" ],
                 "additionalProperties" : false },
-              "within-date-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" :
+                "properties" : 
+                { "start" : 
                   { "title" : "Start Date Condition",
                     "description" : "The task must occur on or after the specified date.",
                     "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-9]{2}:[0-9]{2})$" },
-                  "end" :
+                  "end" : 
                   { "title" : "End Date Condition",
                     "description" : "The task must occur on or before the specified date.",
                     "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-9]{2}:[0-9]{2})$" } },
-                "required" :
+                "required" : 
                 [ "start",
                   "end" ],
                 "additionalProperties" : false },
-              "at-frequency" :
+              "at-frequency" : 
               { "title" : "Frequency Condition",
                 "description" : "The task is intended to occur at the specified frequency.",
                 "type" : "object",
-                "properties" :
-                { "period" :
+                "properties" : 
+                { "period" : 
                   { "title" : "Period",
                     "description" : "The task must occur after the specified period has elapsed.",
                     "type" : "integer",
                     "multipleOf" : 1,
                     "minimum" : 1 },
-                  "unit" :
+                  "unit" : 
                   { "title" : "Time Unit",
                     "description" : "The unit of time for the period.",
                     "type" : "string",
                     "pattern" : "^\\S(.*\\S)?$",
-                    "enum" :
+                    "enum" : 
                     [ "seconds",
                       "minutes",
                       "hours",
                       "days",
                       "months",
                       "years" ] } },
-                "required" :
+                "required" : 
                 [ "period",
                   "unit" ],
                 "additionalProperties" : false } },
             "additionalProperties" : false },
-          "dependencies" :
+          "dependencies" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Task Dependency",
               "description" : "Used to indicate that a task is dependent on another task.",
               "type" : "object",
-              "properties" :
-              { "task-uuid" :
+              "properties" : 
+              { "task-uuid" : 
                 { "title" : "Task Universally Unique Identifier Reference",
                   "description" : "References a unique task by UUID.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "task-uuid" ],
               "additionalProperties" : false } },
-          "tasks" :
+          "tasks" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_task" } },
-          "associated-activities" :
+          "associated-activities" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Associated Activity",
               "description" : "Identifies an individual activity to be performed as part of a task.",
               "type" : "object",
-              "properties" :
-              { "activity-uuid" :
+              "properties" : 
+              { "activity-uuid" : 
                 { "title" : "Activity Universally Unique Identifier Reference",
                   "description" : "References an activity defined in the list of activities.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "responsible-roles" :
+                "responsible-roles" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-                "subjects" :
+                "subjects" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "activity-uuid",
                 "subjects" ],
               "additionalProperties" : false } },
-          "subjects" :
+          "subjects" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
-          "responsible-roles" :
+          "responsible-roles" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "type",
           "title" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:reviewed-controls" :
+      "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" :
+        "properties" : 
+        { "description" : 
           { "title" : "Control Objective Description",
             "description" : "A human-readable description of control objectives.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "control-selections" :
+          "control-selections" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "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" :
+              "properties" : 
+              { "description" : 
                 { "title" : "Assessed Controls Description",
                   "description" : "A human-readable description of in-scope controls specified for assessment.",
                   "type" : "string" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "include-all" :
+                "include-all" : 
                 { "title" : "All",
                   "description" : "A key word to indicate all.",
                   "type" : "object",
                   "additionalProperties" : false },
-                "include-controls" :
+                "include-controls" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-assessment-common_select-control-by-id" } },
-                "exclude-controls" :
+                "exclude-controls" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-assessment-common_select-control-by-id" } },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
               "additionalProperties" : false } },
-          "control-objective-selections" :
+          "control-objective-selections" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "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" :
+              "properties" : 
+              { "description" : 
                 { "title" : "Control Objectives Description",
                   "description" : "A human-readable description of this collection of control objectives.",
                   "type" : "string" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "include-all" :
+                "include-all" : 
                 { "title" : "All",
                   "description" : "A key word to indicate all.",
                   "type" : "object",
                   "additionalProperties" : false },
-                "include-objectives" :
+                "include-objectives" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-assessment-common_select-objective-by-id" } },
-                "exclude-objectives" :
+                "exclude-objectives" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-assessment-common_select-objective-by-id" } },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
               "additionalProperties" : false } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "control-selections" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:select-control-by-id" :
+      "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" :
+        "properties" : 
+        { "control-id" : 
           { "title" : "Control Identifier Reference",
             "description" : "A reference to a control with a corresponding id value.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "statement-ids" :
+          "statement-ids" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Include Specific Statements",
               "description" : "Used to constrain the selection to only specificity identified statements.",
               "type" : "string",
               "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" } } },
-        "required" :
+        "required" : 
         [ "control-id" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:select-objective-by-id" :
+      "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" :
+        "properties" : 
+        { "objective-id" : 
           { "title" : "Objective ID",
             "description" : "Points to an assessment objective.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" } },
-        "required" :
+        "required" : 
         [ "objective-id" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:assessment-subject-placeholder" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Assessment Subject Placeholder Universally Unique Identifier",
             "description" : "Uniquely identifies a set of assessment subjects that will be identified by a task or an activity that is part of a task.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "description" :
+          "description" : 
           { "title" : "Assessment Subject Placeholder Description",
             "description" : "A human-readable description of intent of this assessment subject placeholder.",
             "type" : "string" },
-          "sources" :
+          "sources" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Assessment Subject Source",
               "description" : "Assessment subjects will be identified while conducting the referenced activity-instance.",
               "type" : "object",
-              "properties" :
-              { "task-uuid" :
+              "properties" : 
+              { "task-uuid" : 
                 { "title" : "Task Universally Unique Identifier",
                   "description" : "Uniquely identifies an assessment activity to be performed as part of the event. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. A UUID should be consistently used for this schedule across revisions of the document.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" } },
-              "required" :
+              "required" : 
               [ "task-uuid" ],
               "additionalProperties" : false } },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "sources" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:assessment-subject" :
+      "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" :
+        "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.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "description" :
+          "description" : 
           { "title" : "Include Subjects Description",
             "description" : "A human-readable description of the collection of subjects being included in this assessment.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "include-all" :
+          "include-all" : 
           { "title" : "All",
             "description" : "A key word to indicate all.",
             "type" : "object",
             "additionalProperties" : false },
-          "include-subjects" :
+          "include-subjects" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_select-subject-by-id" } },
-          "exclude-subjects" :
+          "exclude-subjects" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_select-subject-by-id" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "type" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:select-subject-by-id" :
+      "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" :
+        "properties" : 
+        { "subject-uuid" : 
           { "title" : "Subject Universally Unique Identifier Reference",
             "description" : "A pointer to a component, inventory-item, location, party, user, or resource using it's UUID.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "type" :
+          "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.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "subject-uuid",
           "type" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:subject-reference" :
+      "oscal-ap-oscal-assessment-common:subject-reference" : 
       { "title" : "Identifies the Subject",
         "description" : "A pointer to a resource based on its universally unique identifier (UUID). 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" :
+        "properties" : 
+        { "subject-uuid" : 
           { "title" : "Subject Universally Unique Identifier Reference",
             "description" : "A pointer to a component, inventory-item, location, party, user, or resource using it's UUID.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "type" :
+          "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.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "title" :
+          "title" : 
           { "title" : "Subject Reference Title",
             "description" : "The title or name for the referenced subject.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "subject-uuid",
           "type" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:assessment-assets" :
+      "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" :
+        "properties" : 
+        { "components" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-implementation-common_system-component" } },
-          "assessment-platforms" :
+          "assessment-platforms" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Assessment Platform",
               "description" : "Used to represent the toolset used to perform aspects of the assessment.",
               "type" : "object",
-              "properties" :
-              { "uuid" :
+              "properties" : 
+              { "uuid" : 
                 { "title" : "Assessment Platform Universally Unique Identifier",
                   "description" : "Uniquely identifies this assessment Platform.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "title" :
+                "title" : 
                 { "title" : "Assessment Platform Title",
                   "description" : "The title or name for the assessment platform.",
                   "type" : "string" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "uses-components" :
+                "uses-components" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "title" : "Uses Component",
                     "description" : "The set of components that are used by the assessment platform.",
                     "type" : "object",
-                    "properties" :
-                    { "component-uuid" :
+                    "properties" : 
+                    { "component-uuid" : 
                       { "title" : "Component Universally Unique Identifier Reference",
                         "description" : "A reference to a component that is implemented as part of an inventory item.",
                         "type" : "string",
                         "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                      "props" :
+                      "props" : 
                       { "type" : "array",
                         "minItems" : 1,
-                        "items" :
+                        "items" : 
                         { "$ref" : "#assembly_oscal-metadata_property" } },
-                      "links" :
+                      "links" : 
                       { "type" : "array",
                         "minItems" : 1,
-                        "items" :
+                        "items" : 
                         { "$ref" : "#assembly_oscal-metadata_link" } },
-                      "responsible-parties" :
+                      "responsible-parties" : 
                       { "type" : "array",
                         "minItems" : 1,
-                        "items" :
+                        "items" : 
                         { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-                      "remarks" :
+                      "remarks" : 
                       { "$ref" : "#field_oscal-metadata_remarks" } },
-                    "required" :
+                    "required" : 
                     [ "component-uuid" ],
                     "additionalProperties" : false } },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "uuid" ],
               "additionalProperties" : false } } },
-        "required" :
+        "required" : 
         [ "assessment-platforms" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:finding-target" :
+      "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" :
+        "properties" : 
+        { "type" : 
           { "title" : "Finding Target Type",
             "description" : "Identifies the type of the target.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$",
-            "enum" :
+            "enum" : 
             [ "statement-id",
               "objective-id" ] },
-          "target-id" :
+          "target-id" : 
           { "title" : "Finding Target Identifier Reference",
             "description" : "Identifies the specific target qualified by the type.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "title" :
+          "title" : 
           { "title" : "Objective Status Title",
             "description" : "The title for this objective status.",
             "type" : "string" },
-          "description" :
+          "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" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "status" :
+          "status" : 
           { "title" : "Objective Status",
-            "description" : "A brief indication as to whether the objective is satisfied or not within a given system.",
-            "type" : "string",
-            "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$",
-            "enum" :
-            [ "satisfied",
-              "not-satisfied" ] },
-          "" :
-          { "anyOf" :
-            [
+            "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.",
+                "type" : "string",
+                "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$",
+                "enum" : 
+                [ "satisfied",
+                  "not-satisfied" ] },
+              "reason" : 
               { "title" : "Objective Status Reason",
                 "description" : "The reason the objective was given it's status.",
-                "type" : "string" },
-
-              { "type" : "array",
-                "minItems" : 1,
-                "items" :
-                { "title" : "Objective Status Reason",
-                  "description" : "The reason the objective was given it's status.",
-                  "type" : "string" } } ] },
-          "implementation-status" :
+                "type" : "string",
+                "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
+              "remarks" : 
+              { "$ref" : "#field_oscal-metadata_remarks" } },
+            "required" : 
+            [ "state" ],
+            "additionalProperties" : false },
+          "implementation-status" : 
           { "$ref" : "#assembly_oscal-implementation-common_implementation-status" },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "type",
           "target-id",
           "status" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:observation" :
+      "oscal-ap-oscal-assessment-common:observation" : 
       { "title" : "Observation",
         "description" : "Describes an individual observation.",
         "$id" : "#assembly_oscal-assessment-common_observation",
         "type" : "object",
-        "properties" :
-        { "uuid" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Observation Universally Unique Identifier",
             "description" : "Uniquely identifies this observation. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. Once assigned, a UUID should be consistently used for a given observation across revisions.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "title" :
+          "title" : 
           { "title" : "Observation Title",
             "description" : "The title for this observation.",
             "type" : "string" },
-          "description" :
+          "description" : 
           { "title" : "Observation Description",
             "description" : "A human-readable description of this assessment observation.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "methods" :
+          "methods" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Observation Method",
               "description" : "Identifies how the observation was made.",
               "type" : "string",
               "pattern" : "^\\S(.*\\S)?$" } },
-          "types" :
+          "types" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Observation Type",
               "description" : "Identifies the nature of the observation. More than one may be used to further qualify and enable filtering.",
               "type" : "string",
               "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" } },
-          "origins" :
+          "origins" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_origin" } },
-          "subjects" :
+          "subjects" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_subject-reference" } },
-          "relevant-evidence" :
+          "relevant-evidence" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Relevant Evidence",
               "description" : "Links this observation to relevant evidence.",
               "type" : "object",
-              "properties" :
-              { "href" :
+              "properties" : 
+              { "href" : 
                 { "title" : "Relevant Evidence Reference",
                   "description" : ">A resolvable URL reference to relevant evidence.",
                   "type" : "string",
                   "format" : "uri-reference" },
-                "description" :
+                "description" : 
                 { "title" : "Relevant Evidence Description",
                   "description" : "A human-readable description of this evidence.",
                   "type" : "string" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "description" ],
               "additionalProperties" : false } },
-          "collected" :
+          "collected" : 
           { "title" : "collected field",
             "description" : "Date/time stamp identifying when the finding information was collected.",
             "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-9]{2}:[0-9]{2})$" },
-          "expires" :
+          "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.",
             "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-9]{2}:[0-9]{2})$" },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "description",
           "methods",
           "collected" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:origin" :
+      "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" :
+        "properties" : 
+        { "actors" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_origin-actor" } },
-          "related-tasks" :
+          "related-tasks" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_related-task" } } },
-        "required" :
+        "required" : 
         [ "actors" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:origin-actor" :
+      "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" :
+        "properties" : 
+        { "type" : 
           { "title" : "Actor Type",
             "description" : "The kind of actor.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$",
-            "enum" :
+            "enum" : 
             [ "tool",
               "assessment-platform",
               "party" ] },
-          "actor-uuid" :
+          "actor-uuid" : 
           { "title" : "Actor Universally Unique Identifier Reference",
             "description" : "A pointer to the tool or person based on the associated type.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "role-id" :
+          "role-id" : 
           { "title" : "Actor Role",
             "description" : "For a party, this can optionally be used to specify the role the actor was performing.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } } },
-        "required" :
+        "required" : 
         [ "type",
           "actor-uuid" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:related-task" :
+      "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" :
+        "properties" : 
+        { "task-uuid" : 
           { "title" : "Task Universally Unique Identifier Reference",
             "description" : "References a unique task by UUID.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "responsible-parties" :
+          "responsible-parties" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-          "subjects" :
+          "subjects" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
-          "identified-subject" :
+          "identified-subject" : 
           { "title" : "Identified Subject",
             "description" : "Used to detail assessment subjects that were identfied by this task.",
             "type" : "object",
-            "properties" :
-            { "subject-placeholder-uuid" :
+            "properties" : 
+            { "subject-placeholder-uuid" : 
               { "title" : "Assessment Subject Placeholder Universally Unique Identifier Reference",
                 "description" : "References a unique assessment subject placeholder defined by this task.",
                 "type" : "string",
                 "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-              "subjects" :
+              "subjects" : 
               { "type" : "array",
                 "minItems" : 1,
-                "items" :
+                "items" : 
                 { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } } },
-            "required" :
+            "required" : 
             [ "subject-placeholder-uuid",
               "subjects" ],
             "additionalProperties" : false },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "task-uuid" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:threat-id" :
+      "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" :
+        "properties" : 
+        { "system" : 
           { "title" : "Threat Type Identification System",
             "description" : "Specifies the source of the threat information.",
             "type" : "string",
             "format" : "uri" },
-          "href" :
+          "href" : 
           { "title" : "Threat Information Resource Reference",
             "description" : "An optional location for the threat data, from which this ID originates.",
             "type" : "string",
             "format" : "uri-reference" },
-          "id" :
+          "id" : 
           { "type" : "string" } },
-        "required" :
+        "required" : 
         [ "id",
           "system" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:risk" :
+      "oscal-ap-oscal-assessment-common:risk" : 
       { "title" : "Identified Risk",
         "description" : "An identified risk.",
         "$id" : "#assembly_oscal-assessment-common_risk",
         "type" : "object",
-        "properties" :
-        { "uuid" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Risk Universally Unique Identifier",
             "description" : "Uniquely identifies this risk. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. Once assigned, a UUID should be consistently used for a given risk across revisions.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "title" :
+          "title" : 
           { "title" : "Risk Title",
             "description" : "The title for this risk.",
             "type" : "string" },
-          "description" :
+          "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" :
+          "statement" : 
           { "title" : "Risk Statement",
             "description" : "An summary of impact for how the risk affects the system.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "status" :
+          "status" : 
           { "title" : "Status",
             "description" : "Describes the status of the associated risk.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "origins" :
+          "origins" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_origin" } },
-          "threat-ids" :
+          "threat-ids" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-assessment-common_threat-id" } },
-          "characterizations" :
+          "characterizations" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_characterization" } },
-          "mitigating-factors" :
+          "mitigating-factors" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "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" :
+              "properties" : 
+              { "uuid" : 
                 { "title" : "Mitigating Factor Universally Unique Identifier",
                   "description" : "Uniquely identifies this mitigating factor. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. Once assigned, a UUID should be consistently used for a given mitigating factor across revisions.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "implementation-uuid" :
+                "implementation-uuid" : 
                 { "title" : "Implementation UUID",
                   "description" : "Points to an implementation statement in the SSP.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "description" :
+                "description" : 
                 { "title" : "Mitigating Factor Description",
                   "description" : "A human-readable description of this mitigating factor.",
                   "type" : "string" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "subjects" :
+                "subjects" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-assessment-common_subject-reference" } } },
-              "required" :
+              "required" : 
               [ "uuid",
                 "description" ],
               "additionalProperties" : false } },
-          "deadline" :
+          "deadline" : 
           { "title" : "Risk Resolution Deadline",
             "description" : "The date/time by which the risk must be resolved.",
             "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-9]{2}:[0-9]{2})$" },
-          "remediations" :
+          "remediations" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_response" } },
-          "risk-log" :
+          "risk-log" : 
           { "title" : "Risk Log",
             "description" : "A log of all risk-related tasks taken.",
             "type" : "object",
-            "properties" :
-            { "entries" :
+            "properties" : 
+            { "entries" : 
               { "type" : "array",
                 "minItems" : 1,
-                "items" :
+                "items" : 
                 { "title" : "Risk Log Entry",
                   "description" : "Identifies an individual risk response that occurred as part of managing an identified risk.",
                   "type" : "object",
-                  "properties" :
-                  { "uuid" :
+                  "properties" : 
+                  { "uuid" : 
                     { "title" : "Risk Log Entry Universally Unique Identifier",
                       "description" : "Uniquely identifies a risk log entry. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. A UUID should be consistently used for this schedule across revisions of the document.",
                       "type" : "string",
                       "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                    "title" :
+                    "title" : 
                     { "title" : "Title",
                       "description" : "The title for this risk log entry.",
                       "type" : "string" },
-                    "description" :
+                    "description" : 
                     { "title" : "Risk Task Description",
                       "description" : "A human-readable description of what was done regarding the risk.",
                       "type" : "string" },
-                    "start" :
+                    "start" : 
                     { "title" : "Start",
                       "description" : "Identifies the start date and time of the event.",
                       "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-9]{2}:[0-9]{2})$" },
-                    "end" :
+                    "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.",
                       "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-9]{2}:[0-9]{2})$" },
-                    "props" :
+                    "props" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "$ref" : "#assembly_oscal-metadata_property" } },
-                    "links" :
+                    "links" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "$ref" : "#assembly_oscal-metadata_link" } },
-                    "logged-by" :
+                    "logged-by" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "$ref" : "#assembly_oscal-assessment-common_logged-by" } },
-                    "status-change" :
+                    "status-change" : 
                     { "$ref" : "#field_oscal-assessment-common_risk-status" },
-                    "related-responses" :
+                    "related-responses" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "title" : "Risk Response Reference",
                         "description" : "Identifies an individual risk response that this log entry is for.",
                         "type" : "object",
-                        "properties" :
-                        { "response-uuid" :
+                        "properties" : 
+                        { "response-uuid" : 
                           { "title" : "Response Universally Unique Identifier Reference",
                             "description" : "References a unique risk response by UUID.",
                             "type" : "string",
                             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                          "props" :
+                          "props" : 
                           { "type" : "array",
                             "minItems" : 1,
-                            "items" :
+                            "items" : 
                             { "$ref" : "#assembly_oscal-metadata_property" } },
-                          "links" :
+                          "links" : 
                           { "type" : "array",
                             "minItems" : 1,
-                            "items" :
+                            "items" : 
                             { "$ref" : "#assembly_oscal-metadata_link" } },
-                          "related-tasks" :
+                          "related-tasks" : 
                           { "type" : "array",
                             "minItems" : 1,
-                            "items" :
+                            "items" : 
                             { "$ref" : "#assembly_oscal-assessment-common_related-task" } },
-                          "remarks" :
+                          "remarks" : 
                           { "$ref" : "#field_oscal-metadata_remarks" } },
-                        "required" :
+                        "required" : 
                         [ "response-uuid" ],
                         "additionalProperties" : false } },
-                    "remarks" :
+                    "remarks" : 
                     { "$ref" : "#field_oscal-metadata_remarks" } },
-                  "required" :
+                  "required" : 
                   [ "uuid",
                     "start" ],
                   "additionalProperties" : false } } },
-            "required" :
+            "required" : 
             [ "entries" ],
             "additionalProperties" : false },
-          "related-observations" :
+          "related-observations" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "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" :
+              "properties" : 
+              { "observation-uuid" : 
                 { "title" : "Observation Universally Unique Identifier Reference",
                   "description" : "References an observation defined in the list of observations.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" } },
-              "required" :
+              "required" : 
               [ "observation-uuid" ],
               "additionalProperties" : false } } },
-        "required" :
+        "required" : 
         [ "uuid",
           "title",
           "description",
           "statement",
           "status" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:logged-by" :
+      "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" :
+        "properties" : 
+        { "party-uuid" : 
           { "title" : "Party UUID Reference",
             "description" : "A pointer to the party who is making the log entry.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "role-id" :
+          "role-id" : 
           { "title" : "Actor Role",
             "description" : "A point to the role-id of the role in which the party is making the log entry.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" } },
-        "required" :
+        "required" : 
         [ "party-uuid" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:risk-status" :
+      "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",
         "type" : "string",
         "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-      "oscal-ap-oscal-assessment-common:characterization" :
+      "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" :
+        "properties" : 
+        { "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "origin" :
+          "origin" : 
           { "$ref" : "#assembly_oscal-assessment-common_origin" },
-          "facets" :
+          "facets" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Facet",
               "description" : "An individual characteristic that is part of a larger set produced by the same actor.",
               "type" : "object",
-              "properties" :
-              { "name" :
+              "properties" : 
+              { "name" : 
                 { "title" : "Facet Name",
                   "description" : "The name of the risk metric within the specified system.",
                   "type" : "string",
                   "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-                "system" :
+                "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.",
                   "type" : "string",
                   "format" : "uri" },
-                "value" :
+                "value" : 
                 { "title" : "Facet Value",
                   "description" : "Indicates the value of the facet.",
                   "type" : "string",
                   "pattern" : "^\\S(.*\\S)?$" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "name",
                 "system",
                 "value" ],
               "additionalProperties" : false } } },
-        "required" :
+        "required" : 
         [ "origin",
           "facets" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:response" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Remediation Universally Unique Identifier",
             "description" : "Uniquely identifies this remediation. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. Once assigned, a UUID should be consistently used for a given remediation across revisions.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "lifecycle" :
+          "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.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "title" :
+          "title" : 
           { "title" : "Response Title",
             "description" : "The title for this response activity.",
             "type" : "string" },
-          "description" :
+          "description" : 
           { "title" : "Response Description",
             "description" : "A human-readable description of this response plan.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "origins" :
+          "origins" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_origin" } },
-          "required-assets" :
+          "required-assets" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Required Asset",
               "description" : "Identifies an asset required to achieve remediation.",
               "type" : "object",
-              "properties" :
-              { "uuid" :
+              "properties" : 
+              { "uuid" : 
                 { "title" : "Required Universally Unique Identifier",
                   "description" : "Uniquely identifies this required asset. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. Once assigned, a UUID should be consistently used for a given required asset across revisions.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "subjects" :
+                "subjects" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-assessment-common_subject-reference" } },
-                "title" :
+                "title" : 
                 { "title" : "Title for Required Asset",
                   "description" : "The title for this required asset.",
                   "type" : "string" },
-                "description" :
+                "description" : 
                 { "title" : "Description of Required Asset",
                   "description" : "A human-readable description of this required asset.",
                   "type" : "string" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "uuid",
                 "description" ],
               "additionalProperties" : false } },
-          "tasks" :
+          "tasks" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_task" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "lifecycle",
           "title",
           "description" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:assessment-part" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Part Identifier",
             "description" : "A unique identifier for a specific part instance. This identifier's uniqueness is document scoped and is intended to be consistent for the same part across minor revisions of the document.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "name" :
+          "name" : 
           { "title" : "Part Name",
             "description" : "A textual label that uniquely identifies the part's semantic type.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "ns" :
+          "ns" : 
           { "title" : "Part Namespace",
             "description" : "A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.",
             "type" : "string",
             "format" : "uri" },
-          "class" :
+          "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.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "title" :
+          "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" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "prose" :
+          "prose" : 
           { "title" : "Part Text",
             "description" : "Permits multiple paragraphs, lists, tables etc.",
             "type" : "string" },
-          "parts" :
+          "parts" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_assessment-part" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } } },
-        "required" :
+        "required" : 
         [ "name" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-catalog-common:part" :
+      "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" :
+        "properties" : 
+        { "id" : 
           { "title" : "Part Identifier",
             "description" : "A unique identifier for a specific part instance. This identifier's uniqueness is document scoped and is intended to be consistent for the same part across minor revisions of the document.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "name" :
+          "name" : 
           { "title" : "Part Name",
             "description" : "A textual label that uniquely identifies the part's semantic type.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "ns" :
+          "ns" : 
           { "title" : "Part Namespace",
             "description" : "A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.",
             "type" : "string",
             "format" : "uri" },
-          "class" :
+          "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.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "title" :
+          "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" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "prose" :
+          "prose" : 
           { "title" : "Part Text",
             "description" : "Permits multiple paragraphs, lists, tables etc.",
             "type" : "string" },
-          "parts" :
+          "parts" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-catalog-common_part" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } } },
-        "required" :
+        "required" : 
         [ "name" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-catalog-common:parameter" :
+      "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" :
+        "properties" : 
+        { "id" : 
           { "title" : "Parameter Identifier",
             "description" : "A unique identifier for a specific parameter instance. This identifier's uniqueness is document scoped and is intended to be consistent for the same parameter across minor revisions of the document.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "class" :
+          "class" : 
           { "title" : "Parameter Class",
             "description" : "A textual label that provides a characterization of the parameter.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "depends-on" :
+          "depends-on" : 
           { "title" : "Depends on",
             "description" : "Another parameter invoking this one",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "label" :
+          "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" :
+          "usage" : 
           { "title" : "Parameter Usage Description",
             "description" : "Describes the purpose and use of a parameter",
             "type" : "string" },
-          "constraints" :
+          "constraints" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-catalog-common_parameter-constraint" } },
-          "guidelines" :
+          "guidelines" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-catalog-common_parameter-guideline" } },
-          "values" :
+          "values" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-catalog-common_parameter-value" } },
-          "select" :
+          "select" : 
           { "$ref" : "#assembly_oscal-catalog-common_parameter-selection" },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "id" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-catalog-common:parameter-constraint" :
+      "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" :
+        "properties" : 
+        { "description" : 
           { "title" : "Constraint Description",
             "description" : "A textual summary of the constraint to be applied.",
             "type" : "string" },
-          "tests" :
+          "tests" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Constraint Test",
               "description" : "A test expression which is expected to be evaluated by a tool.",
               "type" : "object",
-              "properties" :
-              { "expression" :
+              "properties" : 
+              { "expression" : 
                 { "title" : "Constraint test",
                   "description" : "A formal (executable) expression of a constraint",
                   "type" : "string",
                   "pattern" : "^\\S(.*\\S)?$" },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "expression" ],
               "additionalProperties" : false } } },
         "additionalProperties" : false },
-      "oscal-ap-oscal-catalog-common:parameter-guideline" :
+      "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" :
+        "properties" : 
+        { "prose" : 
           { "title" : "Guideline Text",
             "description" : "Prose permits multiple paragraphs, lists, tables etc.",
             "type" : "string" } },
-        "required" :
+        "required" : 
         [ "prose" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-catalog-common:parameter-value" :
+      "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",
         "type" : "string",
         "pattern" : "^\\S(.*\\S)?$" },
-      "oscal-ap-oscal-catalog-common:parameter-selection" :
+      "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" :
+        "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.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$",
-            "enum" :
+            "enum" : 
             [ "one",
               "one-or-more" ] },
-          "choice" :
+          "choice" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Choice",
               "description" : "A value selection among several such options",
               "type" : "string" } } },
         "additionalProperties" : false },
-      "oscal-ap-oscal-implementation-common:system-component" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Component Identifier",
             "description" : "The unique identifier for the component.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "type" :
+          "type" : 
           { "title" : "Component Type",
             "description" : "A category describing the purpose of the component.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "title" :
+          "title" : 
           { "title" : "Component Title",
             "description" : "A human readable name for the system component.",
             "type" : "string" },
-          "description" :
+          "description" : 
           { "title" : "Component Description",
             "description" : "A description of the component, including information about its function.",
             "type" : "string" },
-          "purpose" :
+          "purpose" : 
           { "title" : "Purpose",
             "description" : "A summary of the technological or business purpose of the component.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "status" :
+          "status" : 
           { "title" : "Status",
             "description" : "Describes the operational status of the system component.",
             "type" : "object",
-            "properties" :
-            { "state" :
+            "properties" : 
+            { "state" : 
               { "title" : "State",
                 "description" : "The operational status.",
                 "type" : "string",
                 "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$",
-                "enum" :
+                "enum" : 
                 [ "under-development",
                   "operational",
                   "disposition",
                   "other" ] },
-              "remarks" :
+              "remarks" : 
               { "$ref" : "#field_oscal-metadata_remarks" } },
-            "required" :
+            "required" : 
             [ "state" ],
             "additionalProperties" : false },
-          "responsible-roles" :
+          "responsible-roles" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "protocols" :
+          "protocols" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-implementation-common_protocol" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "type",
           "title",
           "description",
           "status" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-implementation-common:protocol" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Service Protocol Information Universally Unique Identifier",
             "description" : "A globally unique identifier that can be used to reference this service protocol entry elsewhere in an OSCAL document. A UUID should be consistently used for a given resource across revisions of the document.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "name" :
+          "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.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "title" :
+          "title" : 
           { "title" : "Protocol Title",
             "description" : "A human readable name for the protocol (e.g., Transport Layer Security).",
             "type" : "string" },
-          "port-ranges" :
+          "port-ranges" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-implementation-common_port-range" } } },
-        "required" :
+        "required" : 
         [ "name" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-implementation-common:port-range" :
+      "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" :
+        "properties" : 
+        { "start" : 
           { "title" : "Start",
             "description" : "Indicates the starting port number in a port range",
             "type" : "integer",
             "multipleOf" : 1,
             "minimum" : 0 },
-          "end" :
+          "end" : 
           { "title" : "End",
             "description" : "Indicates the ending port number in a port range",
             "type" : "integer",
             "multipleOf" : 1,
             "minimum" : 0 },
-          "transport" :
+          "transport" : 
           { "title" : "Transport",
             "description" : "Indicates the transport type.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$",
-            "enum" :
+            "enum" : 
             [ "TCP",
               "UDP" ] } },
         "additionalProperties" : false },
-      "oscal-ap-oscal-implementation-common:implementation-status" :
+      "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" :
+        "properties" : 
+        { "state" : 
           { "title" : "Implementation State",
             "description" : "Identifies the implementation status of the control or control objective.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "state" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-implementation-common:system-user" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "User Universally Unique Identifier",
             "description" : "The unique identifier for the user class.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "title" :
+          "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" :
+          "short-name" : 
           { "title" : "User Short Name",
             "description" : "A short common name, abbreviation, or acronym for the user.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "description" :
+          "description" : 
           { "title" : "User Description",
             "description" : "A summary of the user's purpose within the system.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "role-ids" :
+          "role-ids" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-metadata_role-id" } },
-          "authorized-privileges" :
+          "authorized-privileges" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-implementation-common_authorized-privilege" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-implementation-common:authorized-privilege" :
+      "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" :
+        "properties" : 
+        { "title" : 
           { "title" : "Privilege Title",
             "description" : "A human readable name for the privilege.",
             "type" : "string" },
-          "description" :
+          "description" : 
           { "title" : "Privilege Description",
             "description" : "A summary of the privilege's purpose within the system.",
             "type" : "string" },
-          "functions-performed" :
+          "functions-performed" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-implementation-common_function-performed" } } },
-        "required" :
+        "required" : 
         [ "title",
           "functions-performed" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-implementation-common:function-performed" :
+      "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",
         "type" : "string",
         "pattern" : "^\\S(.*\\S)?$" },
-      "oscal-ap-oscal-implementation-common:inventory-item" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Inventory Item Universally Unique Identifier",
             "description" : "A globally unique identifier that can be used to reference this inventory item entry elsewhere in an OSCAL document. A UUID should be consistently used for a given resource across revisions of the document.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "description" :
+          "description" : 
           { "title" : "Inventory Item Description",
             "description" : "A summary of the inventory item stating its purpose within the system.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "responsible-parties" :
+          "responsible-parties" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-          "implemented-components" :
+          "implemented-components" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Implemented Component",
               "description" : "The set of components that are implemented in a given system inventory item.",
               "type" : "object",
-              "properties" :
-              { "component-uuid" :
+              "properties" : 
+              { "component-uuid" : 
                 { "title" : "Component Universally Unique Identifier Reference",
                   "description" : "A reference to a component that is implemented as part of an inventory item.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "responsible-parties" :
+                "responsible-parties" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "component-uuid" ],
               "additionalProperties" : false } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "description" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-implementation-common:set-parameter" :
+      "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" :
+        "properties" : 
+        { "param-id" : 
           { "title" : "Parameter ID",
             "description" : "A reference to a parameter within a control, who's catalog has been imported into the current implementation context.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "values" :
+          "values" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Parameter Value",
               "description" : "A parameter value or set of values.",
               "type" : "string",
               "pattern" : "^\\S(.*\\S)?$" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "param-id",
           "values" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-implementation-common:system-id" :
+      "oscal-ap-oscal-implementation-common:system-id" : 
       { "title" : "System Identification",
         "description" : "A unique identifier for the system described by this system security plan.",
         "$id" : "#field_oscal-implementation-common_system-id",
         "type" : "object",
-        "properties" :
-        { "identifier-type" :
+        "properties" : 
+        { "identifier-type" : 
           { "title" : "Identification System Type",
             "description" : "Identifies the identification system from which the provided identifier was assigned.",
             "type" : "string",
             "format" : "uri" },
-          "id" :
+          "id" : 
           { "type" : "string" } },
-        "required" :
+        "required" : 
         [ "id" ],
         "additionalProperties" : false } },
-    "properties" :
-    { "assessment-plan" :
+    "properties" : 
+    { "assessment-plan" : 
       { "$ref" : "#assembly_oscal-ap_assessment-plan" } },
-    "required" :
+    "required" : 
     [ "assessment-plan" ],
     "additionalProperties" : false,
-    "maxProperties" : 1 }
+    "maxProperties" : 1 }
\ 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 0818ea43db..2f1ca48100 100644
--- a/json/schema/oscal_assessment-results_schema.json
+++ b/json/schema/oscal_assessment-results_schema.json
@@ -3,3022 +3,3024 @@
     "$id" : "http://csrc.nist.gov/ns/oscal/1.0.0/oscal-ar-schema.json",
     "$comment" : "OSCAL Assessment Results Model: JSON Schema",
     "type" : "object",
-    "definitions" :
-    { "oscal-ar-oscal-ar:assessment-results" :
+    "definitions" : 
+    { "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Assessment Results Universally Unique Identifier",
             "description" : "Uniquely identifies this assessment results file. This UUID must be changed each time the content of the results changes.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "metadata" :
+          "metadata" : 
           { "$ref" : "#assembly_oscal-metadata_metadata" },
-          "import-ap" :
+          "import-ap" : 
           { "$ref" : "#assembly_oscal-ar_import-ap" },
-          "local-definitions" :
+          "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" :
+            "properties" : 
+            { "objectives-and-methods" : 
               { "type" : "array",
                 "minItems" : 1,
-                "items" :
+                "items" : 
                 { "$ref" : "#assembly_oscal-assessment-common_local-objective" } },
-              "activities" :
+              "activities" : 
               { "type" : "array",
                 "minItems" : 1,
-                "items" :
+                "items" : 
                 { "$ref" : "#assembly_oscal-assessment-common_activity" } },
-              "remarks" :
+              "remarks" : 
               { "$ref" : "#field_oscal-metadata_remarks" } },
             "additionalProperties" : false },
-          "results" :
+          "results" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-ar_result" } },
-          "back-matter" :
+          "back-matter" : 
           { "$ref" : "#assembly_oscal-metadata_back-matter" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "metadata",
           "import-ap",
           "results" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-ar:result" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Results Universally Unique Identifier",
             "description" : "Uniquely identifies this set of results. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. Once assigned, a UUID should be consistently used for a given set of results across revisions.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "title" :
+          "title" : 
           { "title" : "Results Title",
             "description" : "The title for this set of results.",
             "type" : "string" },
-          "description" :
+          "description" : 
           { "title" : "Results Description",
             "description" : "A human-readable description of this set of test results.",
             "type" : "string" },
-          "start" :
+          "start" : 
           { "title" : "start field",
             "description" : "Date/time stamp identifying the start of the evidence collection reflected in these results.",
             "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-9]{2}:[0-9]{2})$" },
-          "end" :
+          "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.",
             "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-9]{2}:[0-9]{2})$" },
-          "prop" :
+          "prop" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "local-definitions" :
+          "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" :
+            "properties" : 
+            { "components" : 
               { "type" : "array",
                 "minItems" : 1,
-                "items" :
+                "items" : 
                 { "$ref" : "#assembly_oscal-implementation-common_system-component" } },
-              "inventory-items" :
+              "inventory-items" : 
               { "type" : "array",
                 "minItems" : 1,
-                "items" :
+                "items" : 
                 { "$ref" : "#assembly_oscal-implementation-common_inventory-item" } },
-              "users" :
+              "users" : 
               { "type" : "array",
                 "minItems" : 1,
-                "items" :
+                "items" : 
                 { "$ref" : "#assembly_oscal-implementation-common_system-user" } },
-              "assessment-assets" :
+              "assessment-assets" : 
               { "$ref" : "#assembly_oscal-assessment-common_assessment-assets" },
-              "tasks" :
+              "tasks" : 
               { "type" : "array",
                 "minItems" : 1,
-                "items" :
+                "items" : 
                 { "$ref" : "#assembly_oscal-assessment-common_task" } } },
             "additionalProperties" : false },
-          "reviewed-controls" :
+          "reviewed-controls" : 
           { "$ref" : "#assembly_oscal-assessment-common_reviewed-controls" },
-          "attestations" :
+          "attestations" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Attestation Statements",
               "description" : "A set of textual statements, typically written by the assessor.",
               "type" : "object",
-              "properties" :
-              { "responsible-parties" :
+              "properties" : 
+              { "responsible-parties" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-                "parts" :
+                "parts" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-assessment-common_assessment-part" } } },
-              "required" :
+              "required" : 
               [ "parts" ],
               "additionalProperties" : false } },
-          "assessment-log" :
+          "assessment-log" : 
           { "title" : "Assessment Log",
             "description" : "A log of all assessment-related actions taken.",
             "type" : "object",
-            "properties" :
-            { "entries" :
+            "properties" : 
+            { "entries" : 
               { "type" : "array",
                 "minItems" : 1,
-                "items" :
+                "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" :
+                  "properties" : 
+                  { "uuid" : 
                     { "title" : "Assessment Log Entry Universally Unique Identifier",
                       "description" : "Uniquely identifies an assessment event. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. A UUID should be consistently used for this schedule across revisions of the document.",
                       "type" : "string",
                       "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                    "title" :
+                    "title" : 
                     { "title" : "Action Title",
                       "description" : "The title for this event.",
                       "type" : "string" },
-                    "description" :
+                    "description" : 
                     { "title" : "Action Description",
                       "description" : "A human-readable description of this event.",
                       "type" : "string" },
-                    "start" :
+                    "start" : 
                     { "title" : "Start",
                       "description" : "Identifies the start date and time of an event.",
                       "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-9]{2}:[0-9]{2})$" },
-                    "end" :
+                    "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.",
                       "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-9]{2}:[0-9]{2})$" },
-                    "props" :
+                    "props" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "$ref" : "#assembly_oscal-metadata_property" } },
-                    "links" :
+                    "links" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "$ref" : "#assembly_oscal-metadata_link" } },
-                    "logged-by" :
+                    "logged-by" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "$ref" : "#assembly_oscal-assessment-common_logged-by" } },
-                    "related-tasks" :
+                    "related-tasks" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "$ref" : "#assembly_oscal-assessment-common_related-task" } },
-                    "remarks" :
+                    "remarks" : 
                     { "$ref" : "#field_oscal-metadata_remarks" } },
-                  "required" :
+                  "required" : 
                   [ "uuid",
                     "start" ],
                   "additionalProperties" : false } } },
-            "required" :
+            "required" : 
             [ "entries" ],
             "additionalProperties" : false },
-          "observations" :
+          "observations" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_observation" } },
-          "risks" :
+          "risks" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_risk" } },
-          "findings" :
+          "findings" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-ar_finding" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "title",
           "description",
           "start",
           "reviewed-controls" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-ar:finding" :
+      "oscal-ar-oscal-ar:finding" : 
       { "title" : "Finding",
         "description" : "Describes an individual finding.",
         "$id" : "#assembly_oscal-ar_finding",
         "type" : "object",
-        "properties" :
-        { "uuid" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Finding Universally Unique Identifier",
             "description" : "Uniquely identifies this finding. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. Once assigned, a UUID should be consistently used for a given finding across revisions.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "title" :
+          "title" : 
           { "title" : "Finding Title",
             "description" : "The title for this finding.",
             "type" : "string" },
-          "description" :
+          "description" : 
           { "title" : "Finding Description",
             "description" : "A human-readable description of this finding.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "origins" :
+          "origins" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_origin" } },
-          "target" :
+          "target" : 
           { "$ref" : "#assembly_oscal-assessment-common_finding-target" },
-          "implementation-statement-uuid" :
+          "implementation-statement-uuid" : 
           { "title" : "Implementation Statement UUID",
             "description" : "Identifies the implementation statement in the SSP to which this finding is related.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "related-observations" :
+          "related-observations" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "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" :
+              "properties" : 
+              { "observation-uuid" : 
                 { "title" : "Observation Universally Unique Identifier Reference",
                   "description" : "References an observation defined in the list of observations.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" } },
-              "required" :
+              "required" : 
               [ "observation-uuid" ],
               "additionalProperties" : false } },
-          "related-risks" :
+          "related-risks" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "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" :
+              "properties" : 
+              { "risk-uuid" : 
                 { "title" : "Risk Universally Unique Identifier Reference",
                   "description" : "References an risk defined in the list of risks.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" } },
-              "required" :
+              "required" : 
               [ "risk-uuid" ],
               "additionalProperties" : false } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "title",
           "description",
           "target" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-ar:import-ap" :
+      "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" :
+        "properties" : 
+        { "href" : 
           { "title" : "Assessment Plan Reference",
             "description" : ">A resolvable URL reference to the assessment plan governing the assessment activities.",
             "type" : "string",
             "format" : "uri-reference" },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "href" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-metadata:metadata" :
+      "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",
         "type" : "object",
-        "properties" :
-        { "title" :
+        "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" :
+          "published" : 
           { "$ref" : "#field_oscal-metadata_published" },
-          "last-modified" :
+          "last-modified" : 
           { "$ref" : "#field_oscal-metadata_last-modified" },
-          "version" :
+          "version" : 
           { "$ref" : "#field_oscal-metadata_version" },
-          "oscal-version" :
+          "oscal-version" : 
           { "$ref" : "#field_oscal-metadata_oscal-version" },
-          "revisions" :
+          "revisions" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_revision" } },
-          "document-ids" :
+          "document-ids" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-metadata_document-id" } },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "roles" :
+          "roles" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_role" } },
-          "locations" :
+          "locations" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_location" } },
-          "parties" :
+          "parties" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_party" } },
-          "responsible-parties" :
+          "responsible-parties" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "title",
           "last-modified",
           "version",
           "oscal-version" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-metadata:revision" :
+      "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" :
+        "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" :
+          "published" : 
           { "$ref" : "#field_oscal-metadata_published" },
-          "last-modified" :
+          "last-modified" : 
           { "$ref" : "#field_oscal-metadata_last-modified" },
-          "version" :
+          "version" : 
           { "$ref" : "#field_oscal-metadata_version" },
-          "oscal-version" :
+          "oscal-version" : 
           { "$ref" : "#field_oscal-metadata_oscal-version" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
         "additionalProperties" : false },
-      "oscal-ar-oscal-metadata:location" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Location Universally Unique Identifier",
             "description" : "A unique identifier that can be used to reference this defined location elsewhere in an OSCAL document. A UUID should be consistently used for a given location across revisions of the document.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "title" :
+          "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" :
+          "address" : 
           { "$ref" : "#assembly_oscal-metadata_address" },
-          "email-addresses" :
+          "email-addresses" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-metadata_email-address" } },
-          "telephone-numbers" :
+          "telephone-numbers" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-metadata_telephone-number" } },
-          "urls" :
+          "urls" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Location URL",
               "description" : "The uniform resource locator (URL) for a web site or Internet presence associated with the location.",
               "type" : "string",
               "format" : "uri" } },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "address" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-metadata:location-uuid" :
+      "oscal-ar-oscal-metadata:location-uuid" : 
       { "title" : "Location Reference",
         "description" : "References a location defined in metadata.",
         "$id" : "#field_oscal-metadata_location-uuid",
         "type" : "string",
         "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-      "oscal-ar-oscal-metadata:party" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Party Universally Unique Identifier",
             "description" : "A unique identifier that can be used to reference this defined location elsewhere in an OSCAL document. A UUID should be consistently used for a given party across revisions of the document.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "type" :
+          "type" : 
           { "title" : "Party Type",
             "description" : "A category describing the kind of party the object describes.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$",
-            "enum" :
+            "enum" : 
             [ "person",
               "organization" ] },
-          "name" :
+          "name" : 
           { "title" : "Party Name",
             "description" : "The full name of the party. This is typically the legal name associated with the party.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "short-name" :
+          "short-name" : 
           { "title" : "Party Short Name",
             "description" : "A short common name, abbreviation, or acronym for the party.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "external-ids" :
+          "external-ids" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "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" :
+              "properties" : 
+              { "scheme" : 
                 { "title" : "External Identifier Schema",
                   "description" : "Indicates the type of external identifier.",
                   "type" : "string",
                   "format" : "uri" },
-                "id" :
+                "id" : 
                 { "type" : "string" } },
-              "required" :
+              "required" : 
               [ "id",
                 "scheme" ],
               "additionalProperties" : false } },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "email-addresses" :
+          "email-addresses" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-metadata_email-address" } },
-          "telephone-numbers" :
+          "telephone-numbers" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-metadata_telephone-number" } },
-          "addresses" :
+          "addresses" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_address" } },
-          "location-uuids" :
+          "location-uuids" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-metadata_location-uuid" } },
-          "member-of-organizations" :
+          "member-of-organizations" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Organizational Affiliation",
               "description" : "Identifies that the party object is a member of the organization associated with the provided UUID.",
               "type" : "string",
               "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "type" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-metadata:party-uuid" :
+      "oscal-ar-oscal-metadata:party-uuid" : 
       { "title" : "Party Reference",
         "description" : "References a party defined in metadata.",
         "$id" : "#field_oscal-metadata_party-uuid",
         "type" : "string",
         "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-      "oscal-ar-oscal-metadata:role" :
+      "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" :
+        "properties" : 
+        { "id" : 
           { "title" : "Role Identifier",
             "description" : "A unique identifier for a specific role instance. This identifier's uniqueness is document scoped and is intended to be consistent for the same role across minor revisions of the document.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "title" :
+          "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" :
+          "short-name" : 
           { "title" : "Role Short Name",
             "description" : "A short common name, abbreviation, or acronym for the role.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "description" :
+          "description" : 
           { "title" : "Role Description",
             "description" : "A summary of the role's purpose and associated responsibilities.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "id",
           "title" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-metadata:role-id" :
+      "oscal-ar-oscal-metadata:role-id" : 
       { "title" : "Role Identifier Reference",
         "description" : "A reference to the roles served by the user.",
         "$id" : "#field_oscal-metadata_role-id",
         "type" : "string",
         "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-      "oscal-ar-oscal-metadata:back-matter" :
+      "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" :
+        "properties" : 
+        { "resources" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "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" :
+              "properties" : 
+              { "uuid" : 
                 { "title" : "Resource Universally Unique Identifier",
                   "description" : "A globally unique identifier that can be used to reference this defined resource elsewhere in an OSCAL document. A UUID should be consistently used for a given resource across revisions of the document.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "title" :
+                "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" :
+                "description" : 
                 { "title" : "Resource Description",
                   "description" : "A short summary of the resource used to indicate the purpose of the resource.",
                   "type" : "string" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "document-ids" :
+                "document-ids" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#field_oscal-metadata_document-id" } },
-                "citation" :
+                "citation" : 
                 { "title" : "Citation",
                   "description" : "A citation consisting of end note text and optional structured bibliographic data.",
                   "type" : "object",
-                  "properties" :
-                  { "text" :
+                  "properties" : 
+                  { "text" : 
                     { "title" : "Citation Text",
                       "description" : "A line of citation text.",
                       "type" : "string" },
-                    "props" :
+                    "props" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "$ref" : "#assembly_oscal-metadata_property" } },
-                    "links" :
+                    "links" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "$ref" : "#assembly_oscal-metadata_link" } } },
-                  "required" :
+                  "required" : 
                   [ "text" ],
                   "additionalProperties" : false },
-                "rlinks" :
+                "rlinks" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "title" : "Resource link",
                     "description" : "A pointer to an external resource with an optional hash for verification and change detection.",
                     "type" : "object",
-                    "properties" :
-                    { "href" :
+                    "properties" : 
+                    { "href" : 
                       { "title" : "Hypertext Reference",
                         "description" : "A resolvable URI reference to a resource.",
                         "type" : "string",
                         "format" : "uri-reference" },
-                      "media-type" :
+                      "media-type" : 
                       { "title" : "Media Type",
                         "description" : "Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry.",
                         "type" : "string",
                         "pattern" : "^\\S(.*\\S)?$" },
-                      "hashes" :
+                      "hashes" : 
                       { "type" : "array",
                         "minItems" : 1,
-                        "items" :
+                        "items" : 
                         { "$ref" : "#field_oscal-metadata_hash" } } },
-                    "required" :
+                    "required" : 
                     [ "href" ],
                     "additionalProperties" : false } },
-                "base64" :
+                "base64" : 
                 { "title" : "Base64",
                   "description" : "The Base64 alphabet in RFC 2045 - aligned with XSD.",
                   "type" : "object",
-                  "properties" :
-                  { "filename" :
+                  "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.",
                       "type" : "string",
                       "format" : "uri-reference" },
-                    "media-type" :
+                    "media-type" : 
                     { "title" : "Media Type",
                       "description" : "Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry.",
                       "type" : "string",
                       "pattern" : "^\\S(.*\\S)?$" },
-                    "value" :
+                    "value" : 
                     { "type" : "string" } },
-                  "required" :
+                  "required" : 
                   [ "value" ],
                   "additionalProperties" : false },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "uuid" ],
               "additionalProperties" : false } } },
         "additionalProperties" : false },
-      "oscal-ar-oscal-metadata:property" :
+      "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" :
+        "properties" : 
+        { "name" : 
           { "title" : "Property Name",
             "description" : "A textual label that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "uuid" :
+          "uuid" : 
           { "title" : "Property Universally Unique Identifier",
             "description" : "A unique identifier that can be used to reference this property elsewhere in an OSCAL document. A UUID should be consistently used for a given location across revisions of the document.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "ns" :
+          "ns" : 
           { "title" : "Property Namespace",
             "description" : "A namespace qualifying the property's name. This allows different organizations to associate distinct semantics with the same name.",
             "type" : "string",
             "format" : "uri" },
-          "value" :
+          "value" : 
           { "title" : "Property Value",
             "description" : "Indicates the value of the attribute, characteristic, or quality.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "class" :
+          "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.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "name",
           "value" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-metadata:link" :
+      "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" :
+        "properties" : 
+        { "href" : 
           { "title" : "Hypertext Reference",
             "description" : "A resolvable URL reference to a resource.",
             "type" : "string",
             "format" : "uri-reference" },
-          "rel" :
+          "rel" : 
           { "title" : "Relation",
             "description" : "Describes the type of relationship provided by the link. This can be an indicator of the link's purpose.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "media-type" :
+          "media-type" : 
           { "title" : "Media Type",
             "description" : "Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "text" :
+          "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" :
+        "required" : 
         [ "href" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-metadata:responsible-party" :
+      "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" :
+        "properties" : 
+        { "role-id" : 
           { "title" : "Responsible Role",
             "description" : "The role that the party is responsible for.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "party-uuids" :
+          "party-uuids" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-metadata_party-uuid" } },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "role-id",
           "party-uuids" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-metadata:responsible-role" :
+      "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" :
+        "properties" : 
+        { "role-id" : 
           { "title" : "Responsible Role ID",
             "description" : "The role that is responsible for the business function.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "party-uuids" :
+          "party-uuids" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-metadata_party-uuid" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "role-id" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-metadata:hash" :
+      "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" :
+        "properties" : 
+        { "algorithm" : 
           { "title" : "Hash algorithm",
             "description" : "Method by which a hash is derived",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "value" :
+          "value" : 
           { "type" : "string" } },
-        "required" :
+        "required" : 
         [ "value",
           "algorithm" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-metadata:remarks" :
+      "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" :
+      "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",
         "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-9]{2}:[0-9]{2})$" },
-      "oscal-ar-oscal-metadata:last-modified" :
+      "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",
         "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-9]{2}:[0-9]{2})$" },
-      "oscal-ar-oscal-metadata:version" :
+      "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",
         "type" : "string",
         "pattern" : "^\\S(.*\\S)?$" },
-      "oscal-ar-oscal-metadata:oscal-version" :
+      "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",
         "type" : "string",
         "pattern" : "^\\S(.*\\S)?$" },
-      "oscal-ar-oscal-metadata:email-address" :
+      "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",
         "type" : "string",
         "format" : "email",
         "pattern" : "^.+@.+" },
-      "oscal-ar-oscal-metadata:telephone-number" :
+      "oscal-ar-oscal-metadata:telephone-number" : 
       { "title" : "Telephone Number",
         "description" : "Contact number by telephone.",
         "$id" : "#field_oscal-metadata_telephone-number",
         "type" : "object",
-        "properties" :
-        { "type" :
+        "properties" : 
+        { "type" : 
           { "title" : "type flag",
             "description" : "Indicates the type of phone number.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "number" :
+          "number" : 
           { "type" : "string" } },
-        "required" :
+        "required" : 
         [ "number" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-metadata:address" :
+      "oscal-ar-oscal-metadata:address" : 
       { "title" : "Address",
         "description" : "A postal address for the location.",
         "$id" : "#assembly_oscal-metadata_address",
         "type" : "object",
-        "properties" :
-        { "type" :
+        "properties" : 
+        { "type" : 
           { "title" : "Address Type",
             "description" : "Indicates the type of address.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "addr-lines" :
+          "addr-lines" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-metadata_addr-line" } },
-          "city" :
+          "city" : 
           { "title" : "City",
             "description" : "City, town or geographical region for the mailing address.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "state" :
+          "state" : 
           { "title" : "State",
             "description" : "State, province or analogous geographical region for mailing address",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "postal-code" :
+          "postal-code" : 
           { "title" : "Postal Code",
             "description" : "Postal or ZIP code for mailing address",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "country" :
+          "country" : 
           { "title" : "Country Code",
             "description" : "The ISO 3166-1 alpha-2 country code for the mailing address.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" } },
         "additionalProperties" : false },
-      "oscal-ar-oscal-metadata:addr-line" :
+      "oscal-ar-oscal-metadata:addr-line" : 
       { "title" : "Address line",
         "description" : "A single line of an address.",
         "$id" : "#field_oscal-metadata_addr-line",
         "type" : "string",
         "pattern" : "^\\S(.*\\S)?$" },
-      "oscal-ar-oscal-metadata:document-id" :
+      "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 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" :
+        "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.",
             "type" : "string",
             "format" : "uri" },
-          "identifier" :
+          "identifier" : 
           { "type" : "string" } },
-        "required" :
+        "required" : 
         [ "identifier" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:import-ssp" :
+      "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" :
+        "properties" : 
+        { "href" : 
           { "title" : "System Security Plan Reference",
             "description" : ">A resolvable URL reference to the system security plan for the system being assessed.",
             "type" : "string",
             "format" : "uri-reference" },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "href" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:local-objective" :
+      "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" :
+        "properties" : 
+        { "control-id" : 
           { "title" : "Control Identifier Reference",
             "description" : "A reference to a control with a corresponding id value.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "description" :
+          "description" : 
           { "title" : "Objective Description",
             "description" : "A human-readable description of this control objective.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "parts" :
+          "parts" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-catalog-common_part" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "control-id",
           "parts" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:assessment-method" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Assessment Method Universally Unique Identifier",
             "description" : "Uniquely identifies this defined assessment method. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. A UUID should be consistently used for a given assessment method across revisions of the document.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "description" :
+          "description" : 
           { "title" : "Assessment Method Description",
             "description" : "A human-readable description of this assessment method.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "part" :
+          "part" : 
           { "$ref" : "#assembly_oscal-assessment-common_assessment-part" },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "part" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:activity" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Assessment Activity Universally Unique Identifier",
             "description" : "Uniquely identifies this assessment activity. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. A UUID should be consistently used for a given included activity across revisions of the document.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "title" :
+          "title" : 
           { "title" : "Included Activity Title",
             "description" : "The title for this included activity.",
             "type" : "string" },
-          "description" :
+          "description" : 
           { "title" : "Included Activity Description",
             "description" : "A human-readable description of this included activity.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "steps" :
+          "steps" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "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" :
+              "properties" : 
+              { "uuid" : 
                 { "title" : "Step Universally Unique Identifier",
                   "description" : "Uniquely identifies a step. This UUID may be referenced elsewhere in an OSCAL document when referring to this step. A UUID should be consistently used for a given test step across revisions of the document.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "title" :
+                "title" : 
                 { "title" : "Step Title",
                   "description" : "The title for this step.",
                   "type" : "string" },
-                "description" :
+                "description" : 
                 { "title" : "Step Description",
                   "description" : "A human-readable description of this step.",
                   "type" : "string" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "reviewed-controls" :
+                "reviewed-controls" : 
                 { "$ref" : "#assembly_oscal-assessment-common_reviewed-controls" },
-                "responsible-roles" :
+                "responsible-roles" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "uuid",
                 "description" ],
               "additionalProperties" : false } },
-          "related-controls" :
+          "related-controls" : 
           { "$ref" : "#assembly_oscal-assessment-common_reviewed-controls" },
-          "responsible-roles" :
+          "responsible-roles" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "description" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:task" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Task Universally Unique Identifier",
             "description" : "Uniquely identifies this assessment task.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "type" :
+          "type" : 
           { "title" : "Task Type",
             "description" : "The type of task.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "title" :
+          "title" : 
           { "title" : "Task Title",
             "description" : "The title for this task.",
             "type" : "string" },
-          "description" :
+          "description" : 
           { "title" : "Task Description",
             "description" : "A human-readable description of this task.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "timing" :
+          "timing" : 
           { "title" : "Event Timing",
             "description" : "The timing under which the task is intended to occur.",
             "type" : "object",
-            "properties" :
-            { "on-date" :
+            "properties" : 
+            { "on-date" : 
               { "title" : "On Date Condition",
                 "description" : "The task is intended to occur on the specified date.",
                 "type" : "object",
-                "properties" :
-                { "date" :
+                "properties" : 
+                { "date" : 
                   { "title" : "On Date Condition",
                     "description" : "The task must occur on the specified date.",
                     "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-9]{2}:[0-9]{2})$" } },
-                "required" :
+                "required" : 
                 [ "date" ],
                 "additionalProperties" : false },
-              "within-date-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" :
+                "properties" : 
+                { "start" : 
                   { "title" : "Start Date Condition",
                     "description" : "The task must occur on or after the specified date.",
                     "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-9]{2}:[0-9]{2})$" },
-                  "end" :
+                  "end" : 
                   { "title" : "End Date Condition",
                     "description" : "The task must occur on or before the specified date.",
                     "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-9]{2}:[0-9]{2})$" } },
-                "required" :
+                "required" : 
                 [ "start",
                   "end" ],
                 "additionalProperties" : false },
-              "at-frequency" :
+              "at-frequency" : 
               { "title" : "Frequency Condition",
                 "description" : "The task is intended to occur at the specified frequency.",
                 "type" : "object",
-                "properties" :
-                { "period" :
+                "properties" : 
+                { "period" : 
                   { "title" : "Period",
                     "description" : "The task must occur after the specified period has elapsed.",
                     "type" : "integer",
                     "multipleOf" : 1,
                     "minimum" : 1 },
-                  "unit" :
+                  "unit" : 
                   { "title" : "Time Unit",
                     "description" : "The unit of time for the period.",
                     "type" : "string",
                     "pattern" : "^\\S(.*\\S)?$",
-                    "enum" :
+                    "enum" : 
                     [ "seconds",
                       "minutes",
                       "hours",
                       "days",
                       "months",
                       "years" ] } },
-                "required" :
+                "required" : 
                 [ "period",
                   "unit" ],
                 "additionalProperties" : false } },
             "additionalProperties" : false },
-          "dependencies" :
+          "dependencies" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Task Dependency",
               "description" : "Used to indicate that a task is dependent on another task.",
               "type" : "object",
-              "properties" :
-              { "task-uuid" :
+              "properties" : 
+              { "task-uuid" : 
                 { "title" : "Task Universally Unique Identifier Reference",
                   "description" : "References a unique task by UUID.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "task-uuid" ],
               "additionalProperties" : false } },
-          "tasks" :
+          "tasks" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_task" } },
-          "associated-activities" :
+          "associated-activities" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Associated Activity",
               "description" : "Identifies an individual activity to be performed as part of a task.",
               "type" : "object",
-              "properties" :
-              { "activity-uuid" :
+              "properties" : 
+              { "activity-uuid" : 
                 { "title" : "Activity Universally Unique Identifier Reference",
                   "description" : "References an activity defined in the list of activities.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "responsible-roles" :
+                "responsible-roles" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-                "subjects" :
+                "subjects" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "activity-uuid",
                 "subjects" ],
               "additionalProperties" : false } },
-          "subjects" :
+          "subjects" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
-          "responsible-roles" :
+          "responsible-roles" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "type",
           "title" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:reviewed-controls" :
+      "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" :
+        "properties" : 
+        { "description" : 
           { "title" : "Control Objective Description",
             "description" : "A human-readable description of control objectives.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "control-selections" :
+          "control-selections" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "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" :
+              "properties" : 
+              { "description" : 
                 { "title" : "Assessed Controls Description",
                   "description" : "A human-readable description of in-scope controls specified for assessment.",
                   "type" : "string" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "include-all" :
+                "include-all" : 
                 { "title" : "All",
                   "description" : "A key word to indicate all.",
                   "type" : "object",
                   "additionalProperties" : false },
-                "include-controls" :
+                "include-controls" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-assessment-common_select-control-by-id" } },
-                "exclude-controls" :
+                "exclude-controls" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-assessment-common_select-control-by-id" } },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
               "additionalProperties" : false } },
-          "control-objective-selections" :
+          "control-objective-selections" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "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" :
+              "properties" : 
+              { "description" : 
                 { "title" : "Control Objectives Description",
                   "description" : "A human-readable description of this collection of control objectives.",
                   "type" : "string" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "include-all" :
+                "include-all" : 
                 { "title" : "All",
                   "description" : "A key word to indicate all.",
                   "type" : "object",
                   "additionalProperties" : false },
-                "include-objectives" :
+                "include-objectives" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-assessment-common_select-objective-by-id" } },
-                "exclude-objectives" :
+                "exclude-objectives" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-assessment-common_select-objective-by-id" } },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
               "additionalProperties" : false } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "control-selections" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:select-control-by-id" :
+      "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" :
+        "properties" : 
+        { "control-id" : 
           { "title" : "Control Identifier Reference",
             "description" : "A reference to a control with a corresponding id value.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "statement-ids" :
+          "statement-ids" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Include Specific Statements",
               "description" : "Used to constrain the selection to only specificity identified statements.",
               "type" : "string",
               "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" } } },
-        "required" :
+        "required" : 
         [ "control-id" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:select-objective-by-id" :
+      "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" :
+        "properties" : 
+        { "objective-id" : 
           { "title" : "Objective ID",
             "description" : "Points to an assessment objective.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" } },
-        "required" :
+        "required" : 
         [ "objective-id" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:assessment-subject-placeholder" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Assessment Subject Placeholder Universally Unique Identifier",
             "description" : "Uniquely identifies a set of assessment subjects that will be identified by a task or an activity that is part of a task.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "description" :
+          "description" : 
           { "title" : "Assessment Subject Placeholder Description",
             "description" : "A human-readable description of intent of this assessment subject placeholder.",
             "type" : "string" },
-          "sources" :
+          "sources" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Assessment Subject Source",
               "description" : "Assessment subjects will be identified while conducting the referenced activity-instance.",
               "type" : "object",
-              "properties" :
-              { "task-uuid" :
+              "properties" : 
+              { "task-uuid" : 
                 { "title" : "Task Universally Unique Identifier",
                   "description" : "Uniquely identifies an assessment activity to be performed as part of the event. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. A UUID should be consistently used for this schedule across revisions of the document.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" } },
-              "required" :
+              "required" : 
               [ "task-uuid" ],
               "additionalProperties" : false } },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "sources" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:assessment-subject" :
+      "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" :
+        "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.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "description" :
+          "description" : 
           { "title" : "Include Subjects Description",
             "description" : "A human-readable description of the collection of subjects being included in this assessment.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "include-all" :
+          "include-all" : 
           { "title" : "All",
             "description" : "A key word to indicate all.",
             "type" : "object",
             "additionalProperties" : false },
-          "include-subjects" :
+          "include-subjects" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_select-subject-by-id" } },
-          "exclude-subjects" :
+          "exclude-subjects" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_select-subject-by-id" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "type" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:select-subject-by-id" :
+      "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" :
+        "properties" : 
+        { "subject-uuid" : 
           { "title" : "Subject Universally Unique Identifier Reference",
             "description" : "A pointer to a component, inventory-item, location, party, user, or resource using it's UUID.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "type" :
+          "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.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "subject-uuid",
           "type" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:subject-reference" :
+      "oscal-ar-oscal-assessment-common:subject-reference" : 
       { "title" : "Identifies the Subject",
         "description" : "A pointer to a resource based on its universally unique identifier (UUID). 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" :
+        "properties" : 
+        { "subject-uuid" : 
           { "title" : "Subject Universally Unique Identifier Reference",
             "description" : "A pointer to a component, inventory-item, location, party, user, or resource using it's UUID.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "type" :
+          "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.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "title" :
+          "title" : 
           { "title" : "Subject Reference Title",
             "description" : "The title or name for the referenced subject.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "subject-uuid",
           "type" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:assessment-assets" :
+      "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" :
+        "properties" : 
+        { "components" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-implementation-common_system-component" } },
-          "assessment-platforms" :
+          "assessment-platforms" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Assessment Platform",
               "description" : "Used to represent the toolset used to perform aspects of the assessment.",
               "type" : "object",
-              "properties" :
-              { "uuid" :
+              "properties" : 
+              { "uuid" : 
                 { "title" : "Assessment Platform Universally Unique Identifier",
                   "description" : "Uniquely identifies this assessment Platform.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "title" :
+                "title" : 
                 { "title" : "Assessment Platform Title",
                   "description" : "The title or name for the assessment platform.",
                   "type" : "string" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "uses-components" :
+                "uses-components" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "title" : "Uses Component",
                     "description" : "The set of components that are used by the assessment platform.",
                     "type" : "object",
-                    "properties" :
-                    { "component-uuid" :
+                    "properties" : 
+                    { "component-uuid" : 
                       { "title" : "Component Universally Unique Identifier Reference",
                         "description" : "A reference to a component that is implemented as part of an inventory item.",
                         "type" : "string",
                         "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                      "props" :
+                      "props" : 
                       { "type" : "array",
                         "minItems" : 1,
-                        "items" :
+                        "items" : 
                         { "$ref" : "#assembly_oscal-metadata_property" } },
-                      "links" :
+                      "links" : 
                       { "type" : "array",
                         "minItems" : 1,
-                        "items" :
+                        "items" : 
                         { "$ref" : "#assembly_oscal-metadata_link" } },
-                      "responsible-parties" :
+                      "responsible-parties" : 
                       { "type" : "array",
                         "minItems" : 1,
-                        "items" :
+                        "items" : 
                         { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-                      "remarks" :
+                      "remarks" : 
                       { "$ref" : "#field_oscal-metadata_remarks" } },
-                    "required" :
+                    "required" : 
                     [ "component-uuid" ],
                     "additionalProperties" : false } },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "uuid" ],
               "additionalProperties" : false } } },
-        "required" :
+        "required" : 
         [ "assessment-platforms" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:finding-target" :
+      "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" :
+        "properties" : 
+        { "type" : 
           { "title" : "Finding Target Type",
             "description" : "Identifies the type of the target.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$",
-            "enum" :
+            "enum" : 
             [ "statement-id",
               "objective-id" ] },
-          "target-id" :
+          "target-id" : 
           { "title" : "Finding Target Identifier Reference",
             "description" : "Identifies the specific target qualified by the type.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "title" :
+          "title" : 
           { "title" : "Objective Status Title",
             "description" : "The title for this objective status.",
             "type" : "string" },
-          "description" :
+          "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" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "status" :
+          "status" : 
           { "title" : "Objective Status",
-            "description" : "A brief indication as to whether the objective is satisfied or not within a given system.",
-            "type" : "string",
-            "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$",
-            "enum" :
-            [ "satisfied",
-              "not-satisfied" ] },
-          "" :
-          { "anyOf" :
-            [
+            "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.",
+                "type" : "string",
+                "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$",
+                "enum" : 
+                [ "satisfied",
+                  "not-satisfied" ] },
+              "reason" : 
               { "title" : "Objective Status Reason",
                 "description" : "The reason the objective was given it's status.",
-                "type" : "string" },
-
-              { "type" : "array",
-                "minItems" : 1,
-                "items" :
-                { "title" : "Objective Status Reason",
-                  "description" : "The reason the objective was given it's status.",
-                  "type" : "string" } } ] },
-          "implementation-status" :
+                "type" : "string",
+                "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
+              "remarks" : 
+              { "$ref" : "#field_oscal-metadata_remarks" } },
+            "required" : 
+            [ "state" ],
+            "additionalProperties" : false },
+          "implementation-status" : 
           { "$ref" : "#assembly_oscal-implementation-common_implementation-status" },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "type",
           "target-id",
           "status" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:observation" :
+      "oscal-ar-oscal-assessment-common:observation" : 
       { "title" : "Observation",
         "description" : "Describes an individual observation.",
         "$id" : "#assembly_oscal-assessment-common_observation",
         "type" : "object",
-        "properties" :
-        { "uuid" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Observation Universally Unique Identifier",
             "description" : "Uniquely identifies this observation. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. Once assigned, a UUID should be consistently used for a given observation across revisions.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "title" :
+          "title" : 
           { "title" : "Observation Title",
             "description" : "The title for this observation.",
             "type" : "string" },
-          "description" :
+          "description" : 
           { "title" : "Observation Description",
             "description" : "A human-readable description of this assessment observation.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "methods" :
+          "methods" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Observation Method",
               "description" : "Identifies how the observation was made.",
               "type" : "string",
               "pattern" : "^\\S(.*\\S)?$" } },
-          "types" :
+          "types" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Observation Type",
               "description" : "Identifies the nature of the observation. More than one may be used to further qualify and enable filtering.",
               "type" : "string",
               "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" } },
-          "origins" :
+          "origins" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_origin" } },
-          "subjects" :
+          "subjects" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_subject-reference" } },
-          "relevant-evidence" :
+          "relevant-evidence" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Relevant Evidence",
               "description" : "Links this observation to relevant evidence.",
               "type" : "object",
-              "properties" :
-              { "href" :
+              "properties" : 
+              { "href" : 
                 { "title" : "Relevant Evidence Reference",
                   "description" : ">A resolvable URL reference to relevant evidence.",
                   "type" : "string",
                   "format" : "uri-reference" },
-                "description" :
+                "description" : 
                 { "title" : "Relevant Evidence Description",
                   "description" : "A human-readable description of this evidence.",
                   "type" : "string" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "description" ],
               "additionalProperties" : false } },
-          "collected" :
+          "collected" : 
           { "title" : "collected field",
             "description" : "Date/time stamp identifying when the finding information was collected.",
             "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-9]{2}:[0-9]{2})$" },
-          "expires" :
+          "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.",
             "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-9]{2}:[0-9]{2})$" },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "description",
           "methods",
           "collected" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:origin" :
+      "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" :
+        "properties" : 
+        { "actors" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_origin-actor" } },
-          "related-tasks" :
+          "related-tasks" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_related-task" } } },
-        "required" :
+        "required" : 
         [ "actors" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:origin-actor" :
+      "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" :
+        "properties" : 
+        { "type" : 
           { "title" : "Actor Type",
             "description" : "The kind of actor.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$",
-            "enum" :
+            "enum" : 
             [ "tool",
               "assessment-platform",
               "party" ] },
-          "actor-uuid" :
+          "actor-uuid" : 
           { "title" : "Actor Universally Unique Identifier Reference",
             "description" : "A pointer to the tool or person based on the associated type.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "role-id" :
+          "role-id" : 
           { "title" : "Actor Role",
             "description" : "For a party, this can optionally be used to specify the role the actor was performing.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } } },
-        "required" :
+        "required" : 
         [ "type",
           "actor-uuid" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:related-task" :
+      "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" :
+        "properties" : 
+        { "task-uuid" : 
           { "title" : "Task Universally Unique Identifier Reference",
             "description" : "References a unique task by UUID.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "responsible-parties" :
+          "responsible-parties" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-          "subjects" :
+          "subjects" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
-          "identified-subject" :
+          "identified-subject" : 
           { "title" : "Identified Subject",
             "description" : "Used to detail assessment subjects that were identfied by this task.",
             "type" : "object",
-            "properties" :
-            { "subject-placeholder-uuid" :
+            "properties" : 
+            { "subject-placeholder-uuid" : 
               { "title" : "Assessment Subject Placeholder Universally Unique Identifier Reference",
                 "description" : "References a unique assessment subject placeholder defined by this task.",
                 "type" : "string",
                 "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-              "subjects" :
+              "subjects" : 
               { "type" : "array",
                 "minItems" : 1,
-                "items" :
+                "items" : 
                 { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } } },
-            "required" :
+            "required" : 
             [ "subject-placeholder-uuid",
               "subjects" ],
             "additionalProperties" : false },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "task-uuid" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:threat-id" :
+      "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" :
+        "properties" : 
+        { "system" : 
           { "title" : "Threat Type Identification System",
             "description" : "Specifies the source of the threat information.",
             "type" : "string",
             "format" : "uri" },
-          "href" :
+          "href" : 
           { "title" : "Threat Information Resource Reference",
             "description" : "An optional location for the threat data, from which this ID originates.",
             "type" : "string",
             "format" : "uri-reference" },
-          "id" :
+          "id" : 
           { "type" : "string" } },
-        "required" :
+        "required" : 
         [ "id",
           "system" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:risk" :
+      "oscal-ar-oscal-assessment-common:risk" : 
       { "title" : "Identified Risk",
         "description" : "An identified risk.",
         "$id" : "#assembly_oscal-assessment-common_risk",
         "type" : "object",
-        "properties" :
-        { "uuid" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Risk Universally Unique Identifier",
             "description" : "Uniquely identifies this risk. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. Once assigned, a UUID should be consistently used for a given risk across revisions.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "title" :
+          "title" : 
           { "title" : "Risk Title",
             "description" : "The title for this risk.",
             "type" : "string" },
-          "description" :
+          "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" :
+          "statement" : 
           { "title" : "Risk Statement",
             "description" : "An summary of impact for how the risk affects the system.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "status" :
+          "status" : 
           { "title" : "Status",
             "description" : "Describes the status of the associated risk.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "origins" :
+          "origins" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_origin" } },
-          "threat-ids" :
+          "threat-ids" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-assessment-common_threat-id" } },
-          "characterizations" :
+          "characterizations" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_characterization" } },
-          "mitigating-factors" :
+          "mitigating-factors" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "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" :
+              "properties" : 
+              { "uuid" : 
                 { "title" : "Mitigating Factor Universally Unique Identifier",
                   "description" : "Uniquely identifies this mitigating factor. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. Once assigned, a UUID should be consistently used for a given mitigating factor across revisions.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "implementation-uuid" :
+                "implementation-uuid" : 
                 { "title" : "Implementation UUID",
                   "description" : "Points to an implementation statement in the SSP.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "description" :
+                "description" : 
                 { "title" : "Mitigating Factor Description",
                   "description" : "A human-readable description of this mitigating factor.",
                   "type" : "string" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "subjects" :
+                "subjects" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-assessment-common_subject-reference" } } },
-              "required" :
+              "required" : 
               [ "uuid",
                 "description" ],
               "additionalProperties" : false } },
-          "deadline" :
+          "deadline" : 
           { "title" : "Risk Resolution Deadline",
             "description" : "The date/time by which the risk must be resolved.",
             "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-9]{2}:[0-9]{2})$" },
-          "remediations" :
+          "remediations" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_response" } },
-          "risk-log" :
+          "risk-log" : 
           { "title" : "Risk Log",
             "description" : "A log of all risk-related tasks taken.",
             "type" : "object",
-            "properties" :
-            { "entries" :
+            "properties" : 
+            { "entries" : 
               { "type" : "array",
                 "minItems" : 1,
-                "items" :
+                "items" : 
                 { "title" : "Risk Log Entry",
                   "description" : "Identifies an individual risk response that occurred as part of managing an identified risk.",
                   "type" : "object",
-                  "properties" :
-                  { "uuid" :
+                  "properties" : 
+                  { "uuid" : 
                     { "title" : "Risk Log Entry Universally Unique Identifier",
                       "description" : "Uniquely identifies a risk log entry. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. A UUID should be consistently used for this schedule across revisions of the document.",
                       "type" : "string",
                       "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                    "title" :
+                    "title" : 
                     { "title" : "Title",
                       "description" : "The title for this risk log entry.",
                       "type" : "string" },
-                    "description" :
+                    "description" : 
                     { "title" : "Risk Task Description",
                       "description" : "A human-readable description of what was done regarding the risk.",
                       "type" : "string" },
-                    "start" :
+                    "start" : 
                     { "title" : "Start",
                       "description" : "Identifies the start date and time of the event.",
                       "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-9]{2}:[0-9]{2})$" },
-                    "end" :
+                    "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.",
                       "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-9]{2}:[0-9]{2})$" },
-                    "props" :
+                    "props" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "$ref" : "#assembly_oscal-metadata_property" } },
-                    "links" :
+                    "links" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "$ref" : "#assembly_oscal-metadata_link" } },
-                    "logged-by" :
+                    "logged-by" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "$ref" : "#assembly_oscal-assessment-common_logged-by" } },
-                    "status-change" :
+                    "status-change" : 
                     { "$ref" : "#field_oscal-assessment-common_risk-status" },
-                    "related-responses" :
+                    "related-responses" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "title" : "Risk Response Reference",
                         "description" : "Identifies an individual risk response that this log entry is for.",
                         "type" : "object",
-                        "properties" :
-                        { "response-uuid" :
+                        "properties" : 
+                        { "response-uuid" : 
                           { "title" : "Response Universally Unique Identifier Reference",
                             "description" : "References a unique risk response by UUID.",
                             "type" : "string",
                             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                          "props" :
+                          "props" : 
                           { "type" : "array",
                             "minItems" : 1,
-                            "items" :
+                            "items" : 
                             { "$ref" : "#assembly_oscal-metadata_property" } },
-                          "links" :
+                          "links" : 
                           { "type" : "array",
                             "minItems" : 1,
-                            "items" :
+                            "items" : 
                             { "$ref" : "#assembly_oscal-metadata_link" } },
-                          "related-tasks" :
+                          "related-tasks" : 
                           { "type" : "array",
                             "minItems" : 1,
-                            "items" :
+                            "items" : 
                             { "$ref" : "#assembly_oscal-assessment-common_related-task" } },
-                          "remarks" :
+                          "remarks" : 
                           { "$ref" : "#field_oscal-metadata_remarks" } },
-                        "required" :
+                        "required" : 
                         [ "response-uuid" ],
                         "additionalProperties" : false } },
-                    "remarks" :
+                    "remarks" : 
                     { "$ref" : "#field_oscal-metadata_remarks" } },
-                  "required" :
+                  "required" : 
                   [ "uuid",
                     "start" ],
                   "additionalProperties" : false } } },
-            "required" :
+            "required" : 
             [ "entries" ],
             "additionalProperties" : false },
-          "related-observations" :
+          "related-observations" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "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" :
+              "properties" : 
+              { "observation-uuid" : 
                 { "title" : "Observation Universally Unique Identifier Reference",
                   "description" : "References an observation defined in the list of observations.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" } },
-              "required" :
+              "required" : 
               [ "observation-uuid" ],
               "additionalProperties" : false } } },
-        "required" :
+        "required" : 
         [ "uuid",
           "title",
           "description",
           "statement",
           "status" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:logged-by" :
+      "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" :
+        "properties" : 
+        { "party-uuid" : 
           { "title" : "Party UUID Reference",
             "description" : "A pointer to the party who is making the log entry.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "role-id" :
+          "role-id" : 
           { "title" : "Actor Role",
             "description" : "A point to the role-id of the role in which the party is making the log entry.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" } },
-        "required" :
+        "required" : 
         [ "party-uuid" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:risk-status" :
+      "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",
         "type" : "string",
         "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-      "oscal-ar-oscal-assessment-common:characterization" :
+      "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" :
+        "properties" : 
+        { "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "origin" :
+          "origin" : 
           { "$ref" : "#assembly_oscal-assessment-common_origin" },
-          "facets" :
+          "facets" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Facet",
               "description" : "An individual characteristic that is part of a larger set produced by the same actor.",
               "type" : "object",
-              "properties" :
-              { "name" :
+              "properties" : 
+              { "name" : 
                 { "title" : "Facet Name",
                   "description" : "The name of the risk metric within the specified system.",
                   "type" : "string",
                   "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-                "system" :
+                "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.",
                   "type" : "string",
                   "format" : "uri" },
-                "value" :
+                "value" : 
                 { "title" : "Facet Value",
                   "description" : "Indicates the value of the facet.",
                   "type" : "string",
                   "pattern" : "^\\S(.*\\S)?$" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "name",
                 "system",
                 "value" ],
               "additionalProperties" : false } } },
-        "required" :
+        "required" : 
         [ "origin",
           "facets" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:response" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Remediation Universally Unique Identifier",
             "description" : "Uniquely identifies this remediation. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. Once assigned, a UUID should be consistently used for a given remediation across revisions.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "lifecycle" :
+          "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.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "title" :
+          "title" : 
           { "title" : "Response Title",
             "description" : "The title for this response activity.",
             "type" : "string" },
-          "description" :
+          "description" : 
           { "title" : "Response Description",
             "description" : "A human-readable description of this response plan.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "origins" :
+          "origins" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_origin" } },
-          "required-assets" :
+          "required-assets" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Required Asset",
               "description" : "Identifies an asset required to achieve remediation.",
               "type" : "object",
-              "properties" :
-              { "uuid" :
+              "properties" : 
+              { "uuid" : 
                 { "title" : "Required Universally Unique Identifier",
                   "description" : "Uniquely identifies this required asset. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. Once assigned, a UUID should be consistently used for a given required asset across revisions.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "subjects" :
+                "subjects" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-assessment-common_subject-reference" } },
-                "title" :
+                "title" : 
                 { "title" : "Title for Required Asset",
                   "description" : "The title for this required asset.",
                   "type" : "string" },
-                "description" :
+                "description" : 
                 { "title" : "Description of Required Asset",
                   "description" : "A human-readable description of this required asset.",
                   "type" : "string" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "uuid",
                 "description" ],
               "additionalProperties" : false } },
-          "tasks" :
+          "tasks" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_task" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "lifecycle",
           "title",
           "description" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:assessment-part" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Part Identifier",
             "description" : "A unique identifier for a specific part instance. This identifier's uniqueness is document scoped and is intended to be consistent for the same part across minor revisions of the document.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "name" :
+          "name" : 
           { "title" : "Part Name",
             "description" : "A textual label that uniquely identifies the part's semantic type.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "ns" :
+          "ns" : 
           { "title" : "Part Namespace",
             "description" : "A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.",
             "type" : "string",
             "format" : "uri" },
-          "class" :
+          "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.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "title" :
+          "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" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "prose" :
+          "prose" : 
           { "title" : "Part Text",
             "description" : "Permits multiple paragraphs, lists, tables etc.",
             "type" : "string" },
-          "parts" :
+          "parts" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_assessment-part" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } } },
-        "required" :
+        "required" : 
         [ "name" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-catalog-common:part" :
+      "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" :
+        "properties" : 
+        { "id" : 
           { "title" : "Part Identifier",
             "description" : "A unique identifier for a specific part instance. This identifier's uniqueness is document scoped and is intended to be consistent for the same part across minor revisions of the document.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "name" :
+          "name" : 
           { "title" : "Part Name",
             "description" : "A textual label that uniquely identifies the part's semantic type.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "ns" :
+          "ns" : 
           { "title" : "Part Namespace",
             "description" : "A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.",
             "type" : "string",
             "format" : "uri" },
-          "class" :
+          "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.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "title" :
+          "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" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "prose" :
+          "prose" : 
           { "title" : "Part Text",
             "description" : "Permits multiple paragraphs, lists, tables etc.",
             "type" : "string" },
-          "parts" :
+          "parts" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-catalog-common_part" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } } },
-        "required" :
+        "required" : 
         [ "name" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-catalog-common:parameter" :
+      "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" :
+        "properties" : 
+        { "id" : 
           { "title" : "Parameter Identifier",
             "description" : "A unique identifier for a specific parameter instance. This identifier's uniqueness is document scoped and is intended to be consistent for the same parameter across minor revisions of the document.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "class" :
+          "class" : 
           { "title" : "Parameter Class",
             "description" : "A textual label that provides a characterization of the parameter.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "depends-on" :
+          "depends-on" : 
           { "title" : "Depends on",
             "description" : "Another parameter invoking this one",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "label" :
+          "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" :
+          "usage" : 
           { "title" : "Parameter Usage Description",
             "description" : "Describes the purpose and use of a parameter",
             "type" : "string" },
-          "constraints" :
+          "constraints" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-catalog-common_parameter-constraint" } },
-          "guidelines" :
+          "guidelines" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-catalog-common_parameter-guideline" } },
-          "values" :
+          "values" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-catalog-common_parameter-value" } },
-          "select" :
+          "select" : 
           { "$ref" : "#assembly_oscal-catalog-common_parameter-selection" },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "id" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-catalog-common:parameter-constraint" :
+      "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" :
+        "properties" : 
+        { "description" : 
           { "title" : "Constraint Description",
             "description" : "A textual summary of the constraint to be applied.",
             "type" : "string" },
-          "tests" :
+          "tests" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Constraint Test",
               "description" : "A test expression which is expected to be evaluated by a tool.",
               "type" : "object",
-              "properties" :
-              { "expression" :
+              "properties" : 
+              { "expression" : 
                 { "title" : "Constraint test",
                   "description" : "A formal (executable) expression of a constraint",
                   "type" : "string",
                   "pattern" : "^\\S(.*\\S)?$" },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "expression" ],
               "additionalProperties" : false } } },
         "additionalProperties" : false },
-      "oscal-ar-oscal-catalog-common:parameter-guideline" :
+      "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" :
+        "properties" : 
+        { "prose" : 
           { "title" : "Guideline Text",
             "description" : "Prose permits multiple paragraphs, lists, tables etc.",
             "type" : "string" } },
-        "required" :
+        "required" : 
         [ "prose" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-catalog-common:parameter-value" :
+      "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",
         "type" : "string",
         "pattern" : "^\\S(.*\\S)?$" },
-      "oscal-ar-oscal-catalog-common:parameter-selection" :
+      "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" :
+        "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.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$",
-            "enum" :
+            "enum" : 
             [ "one",
               "one-or-more" ] },
-          "choice" :
+          "choice" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Choice",
               "description" : "A value selection among several such options",
               "type" : "string" } } },
         "additionalProperties" : false },
-      "oscal-ar-oscal-implementation-common:system-component" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Component Identifier",
             "description" : "The unique identifier for the component.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "type" :
+          "type" : 
           { "title" : "Component Type",
             "description" : "A category describing the purpose of the component.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "title" :
+          "title" : 
           { "title" : "Component Title",
             "description" : "A human readable name for the system component.",
             "type" : "string" },
-          "description" :
+          "description" : 
           { "title" : "Component Description",
             "description" : "A description of the component, including information about its function.",
             "type" : "string" },
-          "purpose" :
+          "purpose" : 
           { "title" : "Purpose",
             "description" : "A summary of the technological or business purpose of the component.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "status" :
+          "status" : 
           { "title" : "Status",
             "description" : "Describes the operational status of the system component.",
             "type" : "object",
-            "properties" :
-            { "state" :
+            "properties" : 
+            { "state" : 
               { "title" : "State",
                 "description" : "The operational status.",
                 "type" : "string",
                 "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$",
-                "enum" :
+                "enum" : 
                 [ "under-development",
                   "operational",
                   "disposition",
                   "other" ] },
-              "remarks" :
+              "remarks" : 
               { "$ref" : "#field_oscal-metadata_remarks" } },
-            "required" :
+            "required" : 
             [ "state" ],
             "additionalProperties" : false },
-          "responsible-roles" :
+          "responsible-roles" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "protocols" :
+          "protocols" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-implementation-common_protocol" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "type",
           "title",
           "description",
           "status" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-implementation-common:protocol" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Service Protocol Information Universally Unique Identifier",
             "description" : "A globally unique identifier that can be used to reference this service protocol entry elsewhere in an OSCAL document. A UUID should be consistently used for a given resource across revisions of the document.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "name" :
+          "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.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "title" :
+          "title" : 
           { "title" : "Protocol Title",
             "description" : "A human readable name for the protocol (e.g., Transport Layer Security).",
             "type" : "string" },
-          "port-ranges" :
+          "port-ranges" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-implementation-common_port-range" } } },
-        "required" :
+        "required" : 
         [ "name" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-implementation-common:port-range" :
+      "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" :
+        "properties" : 
+        { "start" : 
           { "title" : "Start",
             "description" : "Indicates the starting port number in a port range",
             "type" : "integer",
             "multipleOf" : 1,
             "minimum" : 0 },
-          "end" :
+          "end" : 
           { "title" : "End",
             "description" : "Indicates the ending port number in a port range",
             "type" : "integer",
             "multipleOf" : 1,
             "minimum" : 0 },
-          "transport" :
+          "transport" : 
           { "title" : "Transport",
             "description" : "Indicates the transport type.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$",
-            "enum" :
+            "enum" : 
             [ "TCP",
               "UDP" ] } },
         "additionalProperties" : false },
-      "oscal-ar-oscal-implementation-common:implementation-status" :
+      "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" :
+        "properties" : 
+        { "state" : 
           { "title" : "Implementation State",
             "description" : "Identifies the implementation status of the control or control objective.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "state" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-implementation-common:system-user" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "User Universally Unique Identifier",
             "description" : "The unique identifier for the user class.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "title" :
+          "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" :
+          "short-name" : 
           { "title" : "User Short Name",
             "description" : "A short common name, abbreviation, or acronym for the user.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "description" :
+          "description" : 
           { "title" : "User Description",
             "description" : "A summary of the user's purpose within the system.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "role-ids" :
+          "role-ids" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-metadata_role-id" } },
-          "authorized-privileges" :
+          "authorized-privileges" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-implementation-common_authorized-privilege" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-implementation-common:authorized-privilege" :
+      "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" :
+        "properties" : 
+        { "title" : 
           { "title" : "Privilege Title",
             "description" : "A human readable name for the privilege.",
             "type" : "string" },
-          "description" :
+          "description" : 
           { "title" : "Privilege Description",
             "description" : "A summary of the privilege's purpose within the system.",
             "type" : "string" },
-          "functions-performed" :
+          "functions-performed" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-implementation-common_function-performed" } } },
-        "required" :
+        "required" : 
         [ "title",
           "functions-performed" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-implementation-common:function-performed" :
+      "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",
         "type" : "string",
         "pattern" : "^\\S(.*\\S)?$" },
-      "oscal-ar-oscal-implementation-common:inventory-item" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Inventory Item Universally Unique Identifier",
             "description" : "A globally unique identifier that can be used to reference this inventory item entry elsewhere in an OSCAL document. A UUID should be consistently used for a given resource across revisions of the document.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "description" :
+          "description" : 
           { "title" : "Inventory Item Description",
             "description" : "A summary of the inventory item stating its purpose within the system.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "responsible-parties" :
+          "responsible-parties" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-          "implemented-components" :
+          "implemented-components" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Implemented Component",
               "description" : "The set of components that are implemented in a given system inventory item.",
               "type" : "object",
-              "properties" :
-              { "component-uuid" :
+              "properties" : 
+              { "component-uuid" : 
                 { "title" : "Component Universally Unique Identifier Reference",
                   "description" : "A reference to a component that is implemented as part of an inventory item.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "responsible-parties" :
+                "responsible-parties" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "component-uuid" ],
               "additionalProperties" : false } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "description" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-implementation-common:set-parameter" :
+      "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" :
+        "properties" : 
+        { "param-id" : 
           { "title" : "Parameter ID",
             "description" : "A reference to a parameter within a control, who's catalog has been imported into the current implementation context.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "values" :
+          "values" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Parameter Value",
               "description" : "A parameter value or set of values.",
               "type" : "string",
               "pattern" : "^\\S(.*\\S)?$" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "param-id",
           "values" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-implementation-common:system-id" :
+      "oscal-ar-oscal-implementation-common:system-id" : 
       { "title" : "System Identification",
         "description" : "A unique identifier for the system described by this system security plan.",
         "$id" : "#field_oscal-implementation-common_system-id",
         "type" : "object",
-        "properties" :
-        { "identifier-type" :
+        "properties" : 
+        { "identifier-type" : 
           { "title" : "Identification System Type",
             "description" : "Identifies the identification system from which the provided identifier was assigned.",
             "type" : "string",
             "format" : "uri" },
-          "id" :
+          "id" : 
           { "type" : "string" } },
-        "required" :
+        "required" : 
         [ "id" ],
         "additionalProperties" : false } },
-    "properties" :
-    { "assessment-results" :
+    "properties" : 
+    { "assessment-results" : 
       { "$ref" : "#assembly_oscal-ar_assessment-results" } },
-    "required" :
+    "required" : 
     [ "assessment-results" ],
     "additionalProperties" : false,
-    "maxProperties" : 1 }
+    "maxProperties" : 1 }
\ No newline at end of file
diff --git a/json/schema/oscal_complete_schema.json b/json/schema/oscal_complete_schema.json
index 38410cffae..3a96bec3b6 100644
--- a/json/schema/oscal_complete_schema.json
+++ b/json/schema/oscal_complete_schema.json
@@ -3,2071 +3,2071 @@
     "$id" : "http://csrc.nist.gov/ns/oscal/1.0/1.0.0/oscal-complete-schema.json",
     "$comment" : "OSCAL Unified Model of Models: JSON Schema",
     "type" : "object",
-    "definitions" :
-    { "oscal-complete-oscal-catalog:catalog" :
+    "definitions" : 
+    { "oscal-complete-oscal-catalog:catalog" : 
       { "title" : "Catalog",
         "description" : "A collection of controls.",
         "$id" : "#assembly_oscal-catalog_catalog",
         "type" : "object",
-        "properties" :
-        { "uuid" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Catalog Universally Unique Identifier",
             "description" : "A globally unique identifier for this catalog instance. This UUID should be changed when this document is revised.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "metadata" :
+          "metadata" : 
           { "$ref" : "#assembly_oscal-metadata_metadata" },
-          "params" :
+          "params" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-catalog-common_parameter" } },
-          "controls" :
+          "controls" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-catalog_control" } },
-          "groups" :
+          "groups" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-catalog_group" } },
-          "back-matter" :
+          "back-matter" : 
           { "$ref" : "#assembly_oscal-metadata_back-matter" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "metadata" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-catalog:group" :
+      "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" :
+        "properties" : 
+        { "id" : 
           { "title" : "Group Identifier",
             "description" : "A unique identifier for a specific group instance that can be used to reference the group within this and in other OSCAL documents. This identifier's uniqueness is document scoped and is intended to be consistent for the same group across minor revisions of the document.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "class" :
+          "class" : 
           { "title" : "Group Class",
             "description" : "A textual label that provides a sub-type or characterization of the group.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "title" :
+          "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" :
+          "params" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-catalog-common_parameter" } },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "parts" :
+          "parts" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-catalog-common_part" } },
-          "groups" :
+          "groups" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-catalog_group" } },
-          "controls" :
+          "controls" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-catalog_control" } } },
-        "required" :
+        "required" : 
         [ "title" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-catalog:control" :
+      "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" :
+        "properties" : 
+        { "id" : 
           { "title" : "Control Identifier",
             "description" : "A unique identifier for a specific control instance that can be used to reference the control in other OSCAL documents. This identifier's uniqueness is document scoped and is intended to be consistent for the same control across minor revisions of the document.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "class" :
+          "class" : 
           { "title" : "Control Class",
             "description" : "A textual label that provides a sub-type or characterization of the control.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "title" :
+          "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" :
+          "params" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-catalog-common_parameter" } },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "parts" :
+          "parts" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-catalog-common_part" } },
-          "controls" :
+          "controls" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-catalog_control" } } },
-        "required" :
+        "required" : 
         [ "id",
           "title" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-catalog-common:part" :
+      "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" :
+        "properties" : 
+        { "id" : 
           { "title" : "Part Identifier",
             "description" : "A unique identifier for a specific part instance. This identifier's uniqueness is document scoped and is intended to be consistent for the same part across minor revisions of the document.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "name" :
+          "name" : 
           { "title" : "Part Name",
             "description" : "A textual label that uniquely identifies the part's semantic type.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "ns" :
+          "ns" : 
           { "title" : "Part Namespace",
             "description" : "A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.",
             "type" : "string",
             "format" : "uri" },
-          "class" :
+          "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.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "title" :
+          "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" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "prose" :
+          "prose" : 
           { "title" : "Part Text",
             "description" : "Permits multiple paragraphs, lists, tables etc.",
             "type" : "string" },
-          "parts" :
+          "parts" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-catalog-common_part" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } } },
-        "required" :
+        "required" : 
         [ "name" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-catalog-common:parameter" :
+      "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" :
+        "properties" : 
+        { "id" : 
           { "title" : "Parameter Identifier",
             "description" : "A unique identifier for a specific parameter instance. This identifier's uniqueness is document scoped and is intended to be consistent for the same parameter across minor revisions of the document.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "class" :
+          "class" : 
           { "title" : "Parameter Class",
             "description" : "A textual label that provides a characterization of the parameter.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "depends-on" :
+          "depends-on" : 
           { "title" : "Depends on",
             "description" : "Another parameter invoking this one",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "label" :
+          "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" :
+          "usage" : 
           { "title" : "Parameter Usage Description",
             "description" : "Describes the purpose and use of a parameter",
             "type" : "string" },
-          "constraints" :
+          "constraints" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-catalog-common_parameter-constraint" } },
-          "guidelines" :
+          "guidelines" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-catalog-common_parameter-guideline" } },
-          "values" :
+          "values" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-catalog-common_parameter-value" } },
-          "select" :
+          "select" : 
           { "$ref" : "#assembly_oscal-catalog-common_parameter-selection" },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "id" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-catalog-common:parameter-constraint" :
+      "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" :
+        "properties" : 
+        { "description" : 
           { "title" : "Constraint Description",
             "description" : "A textual summary of the constraint to be applied.",
             "type" : "string" },
-          "tests" :
+          "tests" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Constraint Test",
               "description" : "A test expression which is expected to be evaluated by a tool.",
               "type" : "object",
-              "properties" :
-              { "expression" :
+              "properties" : 
+              { "expression" : 
                 { "title" : "Constraint test",
                   "description" : "A formal (executable) expression of a constraint",
                   "type" : "string",
                   "pattern" : "^\\S(.*\\S)?$" },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "expression" ],
               "additionalProperties" : false } } },
         "additionalProperties" : false },
-      "oscal-complete-oscal-catalog-common:parameter-guideline" :
+      "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" :
+        "properties" : 
+        { "prose" : 
           { "title" : "Guideline Text",
             "description" : "Prose permits multiple paragraphs, lists, tables etc.",
             "type" : "string" } },
-        "required" :
+        "required" : 
         [ "prose" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-catalog-common:parameter-value" :
+      "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",
         "type" : "string",
         "pattern" : "^\\S(.*\\S)?$" },
-      "oscal-complete-oscal-catalog-common:parameter-selection" :
+      "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" :
+        "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.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$",
-            "enum" :
+            "enum" : 
             [ "one",
               "one-or-more" ] },
-          "choice" :
+          "choice" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Choice",
               "description" : "A value selection among several such options",
               "type" : "string" } } },
         "additionalProperties" : false },
-      "oscal-complete-oscal-metadata:metadata" :
+      "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" :
+        "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" :
+          "published" : 
           { "$ref" : "#field_oscal-metadata_published" },
-          "last-modified" :
+          "last-modified" : 
           { "$ref" : "#field_oscal-metadata_last-modified" },
-          "version" :
+          "version" : 
           { "$ref" : "#field_oscal-metadata_version" },
-          "oscal-version" :
+          "oscal-version" : 
           { "$ref" : "#field_oscal-metadata_oscal-version" },
-          "revisions" :
+          "revisions" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_revision" } },
-          "document-ids" :
+          "document-ids" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-metadata_document-id" } },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "roles" :
+          "roles" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_role" } },
-          "locations" :
+          "locations" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_location" } },
-          "parties" :
+          "parties" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_party" } },
-          "responsible-parties" :
+          "responsible-parties" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "title",
           "last-modified",
           "version",
           "oscal-version" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-metadata:revision" :
+      "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" :
+        "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" :
+          "published" : 
           { "$ref" : "#field_oscal-metadata_published" },
-          "last-modified" :
+          "last-modified" : 
           { "$ref" : "#field_oscal-metadata_last-modified" },
-          "version" :
+          "version" : 
           { "$ref" : "#field_oscal-metadata_version" },
-          "oscal-version" :
+          "oscal-version" : 
           { "$ref" : "#field_oscal-metadata_oscal-version" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
         "additionalProperties" : false },
-      "oscal-complete-oscal-metadata:location" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Location Universally Unique Identifier",
             "description" : "A unique identifier that can be used to reference this defined location elsewhere in an OSCAL document. A UUID should be consistently used for a given location across revisions of the document.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "title" :
+          "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" :
+          "address" : 
           { "$ref" : "#assembly_oscal-metadata_address" },
-          "email-addresses" :
+          "email-addresses" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-metadata_email-address" } },
-          "telephone-numbers" :
+          "telephone-numbers" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-metadata_telephone-number" } },
-          "urls" :
+          "urls" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Location URL",
               "description" : "The uniform resource locator (URL) for a web site or Internet presence associated with the location.",
               "type" : "string",
               "format" : "uri" } },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "address" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-metadata:location-uuid" :
+      "oscal-complete-oscal-metadata:location-uuid" : 
       { "title" : "Location Reference",
         "description" : "References a location defined in metadata.",
         "$id" : "#field_oscal-metadata_location-uuid",
         "type" : "string",
         "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-      "oscal-complete-oscal-metadata:party" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Party Universally Unique Identifier",
             "description" : "A unique identifier that can be used to reference this defined location elsewhere in an OSCAL document. A UUID should be consistently used for a given party across revisions of the document.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "type" :
+          "type" : 
           { "title" : "Party Type",
             "description" : "A category describing the kind of party the object describes.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$",
-            "enum" :
+            "enum" : 
             [ "person",
               "organization" ] },
-          "name" :
+          "name" : 
           { "title" : "Party Name",
             "description" : "The full name of the party. This is typically the legal name associated with the party.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "short-name" :
+          "short-name" : 
           { "title" : "Party Short Name",
             "description" : "A short common name, abbreviation, or acronym for the party.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "external-ids" :
+          "external-ids" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "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" :
+              "properties" : 
+              { "scheme" : 
                 { "title" : "External Identifier Schema",
                   "description" : "Indicates the type of external identifier.",
                   "type" : "string",
                   "format" : "uri" },
-                "id" :
+                "id" : 
                 { "type" : "string" } },
-              "required" :
+              "required" : 
               [ "id",
                 "scheme" ],
               "additionalProperties" : false } },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "email-addresses" :
+          "email-addresses" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-metadata_email-address" } },
-          "telephone-numbers" :
+          "telephone-numbers" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-metadata_telephone-number" } },
-          "addresses" :
+          "addresses" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_address" } },
-          "location-uuids" :
+          "location-uuids" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-metadata_location-uuid" } },
-          "member-of-organizations" :
+          "member-of-organizations" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Organizational Affiliation",
               "description" : "Identifies that the party object is a member of the organization associated with the provided UUID.",
               "type" : "string",
               "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "type" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-metadata:party-uuid" :
+      "oscal-complete-oscal-metadata:party-uuid" : 
       { "title" : "Party Reference",
         "description" : "References a party defined in metadata.",
         "$id" : "#field_oscal-metadata_party-uuid",
         "type" : "string",
         "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-      "oscal-complete-oscal-metadata:role" :
+      "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" :
+        "properties" : 
+        { "id" : 
           { "title" : "Role Identifier",
             "description" : "A unique identifier for a specific role instance. This identifier's uniqueness is document scoped and is intended to be consistent for the same role across minor revisions of the document.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "title" :
+          "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" :
+          "short-name" : 
           { "title" : "Role Short Name",
             "description" : "A short common name, abbreviation, or acronym for the role.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "description" :
+          "description" : 
           { "title" : "Role Description",
             "description" : "A summary of the role's purpose and associated responsibilities.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "id",
           "title" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-metadata:role-id" :
+      "oscal-complete-oscal-metadata:role-id" : 
       { "title" : "Role Identifier Reference",
         "description" : "A reference to the roles served by the user.",
         "$id" : "#field_oscal-metadata_role-id",
         "type" : "string",
         "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-      "oscal-complete-oscal-metadata:back-matter" :
+      "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" :
+        "properties" : 
+        { "resources" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "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" :
+              "properties" : 
+              { "uuid" : 
                 { "title" : "Resource Universally Unique Identifier",
                   "description" : "A globally unique identifier that can be used to reference this defined resource elsewhere in an OSCAL document. A UUID should be consistently used for a given resource across revisions of the document.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "title" :
+                "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" :
+                "description" : 
                 { "title" : "Resource Description",
                   "description" : "A short summary of the resource used to indicate the purpose of the resource.",
                   "type" : "string" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "document-ids" :
+                "document-ids" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#field_oscal-metadata_document-id" } },
-                "citation" :
+                "citation" : 
                 { "title" : "Citation",
                   "description" : "A citation consisting of end note text and optional structured bibliographic data.",
                   "type" : "object",
-                  "properties" :
-                  { "text" :
+                  "properties" : 
+                  { "text" : 
                     { "title" : "Citation Text",
                       "description" : "A line of citation text.",
                       "type" : "string" },
-                    "props" :
+                    "props" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "$ref" : "#assembly_oscal-metadata_property" } },
-                    "links" :
+                    "links" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "$ref" : "#assembly_oscal-metadata_link" } } },
-                  "required" :
+                  "required" : 
                   [ "text" ],
                   "additionalProperties" : false },
-                "rlinks" :
+                "rlinks" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "title" : "Resource link",
                     "description" : "A pointer to an external resource with an optional hash for verification and change detection.",
                     "type" : "object",
-                    "properties" :
-                    { "href" :
+                    "properties" : 
+                    { "href" : 
                       { "title" : "Hypertext Reference",
                         "description" : "A resolvable URI reference to a resource.",
                         "type" : "string",
                         "format" : "uri-reference" },
-                      "media-type" :
+                      "media-type" : 
                       { "title" : "Media Type",
                         "description" : "Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry.",
                         "type" : "string",
                         "pattern" : "^\\S(.*\\S)?$" },
-                      "hashes" :
+                      "hashes" : 
                       { "type" : "array",
                         "minItems" : 1,
-                        "items" :
+                        "items" : 
                         { "$ref" : "#field_oscal-metadata_hash" } } },
-                    "required" :
+                    "required" : 
                     [ "href" ],
                     "additionalProperties" : false } },
-                "base64" :
+                "base64" : 
                 { "title" : "Base64",
                   "description" : "The Base64 alphabet in RFC 2045 - aligned with XSD.",
                   "type" : "object",
-                  "properties" :
-                  { "filename" :
+                  "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.",
                       "type" : "string",
                       "format" : "uri-reference" },
-                    "media-type" :
+                    "media-type" : 
                     { "title" : "Media Type",
                       "description" : "Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry.",
                       "type" : "string",
                       "pattern" : "^\\S(.*\\S)?$" },
-                    "value" :
+                    "value" : 
                     { "type" : "string" } },
-                  "required" :
+                  "required" : 
                   [ "value" ],
                   "additionalProperties" : false },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "uuid" ],
               "additionalProperties" : false } } },
         "additionalProperties" : false },
-      "oscal-complete-oscal-metadata:property" :
+      "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" :
+        "properties" : 
+        { "name" : 
           { "title" : "Property Name",
             "description" : "A textual label that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "uuid" :
+          "uuid" : 
           { "title" : "Property Universally Unique Identifier",
             "description" : "A unique identifier that can be used to reference this property elsewhere in an OSCAL document. A UUID should be consistently used for a given location across revisions of the document.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "ns" :
+          "ns" : 
           { "title" : "Property Namespace",
             "description" : "A namespace qualifying the property's name. This allows different organizations to associate distinct semantics with the same name.",
             "type" : "string",
             "format" : "uri" },
-          "value" :
+          "value" : 
           { "title" : "Property Value",
             "description" : "Indicates the value of the attribute, characteristic, or quality.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "class" :
+          "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.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "name",
           "value" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-metadata:link" :
+      "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" :
+        "properties" : 
+        { "href" : 
           { "title" : "Hypertext Reference",
             "description" : "A resolvable URL reference to a resource.",
             "type" : "string",
             "format" : "uri-reference" },
-          "rel" :
+          "rel" : 
           { "title" : "Relation",
             "description" : "Describes the type of relationship provided by the link. This can be an indicator of the link's purpose.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "media-type" :
+          "media-type" : 
           { "title" : "Media Type",
             "description" : "Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "text" :
+          "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" :
+        "required" : 
         [ "href" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-metadata:responsible-party" :
+      "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" :
+        "properties" : 
+        { "role-id" : 
           { "title" : "Responsible Role",
             "description" : "The role that the party is responsible for.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "party-uuids" :
+          "party-uuids" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-metadata_party-uuid" } },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "role-id",
           "party-uuids" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-metadata:responsible-role" :
+      "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" :
+        "properties" : 
+        { "role-id" : 
           { "title" : "Responsible Role ID",
             "description" : "The role that is responsible for the business function.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "party-uuids" :
+          "party-uuids" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-metadata_party-uuid" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "role-id" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-metadata:hash" :
+      "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" :
+        "properties" : 
+        { "algorithm" : 
           { "title" : "Hash algorithm",
             "description" : "Method by which a hash is derived",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "value" :
+          "value" : 
           { "type" : "string" } },
-        "required" :
+        "required" : 
         [ "value",
           "algorithm" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-metadata:remarks" :
+      "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" :
+      "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",
         "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-9]{2}:[0-9]{2})$" },
-      "oscal-complete-oscal-metadata:last-modified" :
+      "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",
         "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-9]{2}:[0-9]{2})$" },
-      "oscal-complete-oscal-metadata:version" :
+      "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",
         "type" : "string",
         "pattern" : "^\\S(.*\\S)?$" },
-      "oscal-complete-oscal-metadata:oscal-version" :
+      "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",
         "type" : "string",
         "pattern" : "^\\S(.*\\S)?$" },
-      "oscal-complete-oscal-metadata:email-address" :
+      "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",
         "type" : "string",
         "format" : "email",
         "pattern" : "^.+@.+" },
-      "oscal-complete-oscal-metadata:telephone-number" :
+      "oscal-complete-oscal-metadata:telephone-number" : 
       { "title" : "Telephone Number",
         "description" : "Contact number by telephone.",
         "$id" : "#field_oscal-metadata_telephone-number",
         "type" : "object",
-        "properties" :
-        { "type" :
+        "properties" : 
+        { "type" : 
           { "title" : "type flag",
             "description" : "Indicates the type of phone number.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "number" :
+          "number" : 
           { "type" : "string" } },
-        "required" :
+        "required" : 
         [ "number" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-metadata:address" :
+      "oscal-complete-oscal-metadata:address" : 
       { "title" : "Address",
         "description" : "A postal address for the location.",
         "$id" : "#assembly_oscal-metadata_address",
         "type" : "object",
-        "properties" :
-        { "type" :
+        "properties" : 
+        { "type" : 
           { "title" : "Address Type",
             "description" : "Indicates the type of address.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "addr-lines" :
+          "addr-lines" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-metadata_addr-line" } },
-          "city" :
+          "city" : 
           { "title" : "City",
             "description" : "City, town or geographical region for the mailing address.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "state" :
+          "state" : 
           { "title" : "State",
             "description" : "State, province or analogous geographical region for mailing address",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "postal-code" :
+          "postal-code" : 
           { "title" : "Postal Code",
             "description" : "Postal or ZIP code for mailing address",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "country" :
+          "country" : 
           { "title" : "Country Code",
             "description" : "The ISO 3166-1 alpha-2 country code for the mailing address.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" } },
         "additionalProperties" : false },
-      "oscal-complete-oscal-metadata:addr-line" :
+      "oscal-complete-oscal-metadata:addr-line" : 
       { "title" : "Address line",
         "description" : "A single line of an address.",
         "$id" : "#field_oscal-metadata_addr-line",
         "type" : "string",
         "pattern" : "^\\S(.*\\S)?$" },
-      "oscal-complete-oscal-metadata:document-id" :
+      "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 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" :
+        "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.",
             "type" : "string",
             "format" : "uri" },
-          "identifier" :
+          "identifier" : 
           { "type" : "string" } },
-        "required" :
+        "required" : 
         [ "identifier" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-profile:profile" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Catalog Universally Unique Identifier",
             "description" : "A globally unique identifier for this profile instance. This UUID should be changed when this document is revised.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "metadata" :
+          "metadata" : 
           { "$ref" : "#assembly_oscal-metadata_metadata" },
-          "imports" :
+          "imports" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-profile_import" } },
-          "merge" :
+          "merge" : 
           { "$ref" : "#assembly_oscal-profile_merge" },
-          "modify" :
+          "modify" : 
           { "$ref" : "#assembly_oscal-profile_modify" },
-          "back-matter" :
+          "back-matter" : 
           { "$ref" : "#assembly_oscal-metadata_back-matter" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "metadata",
           "imports" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-profile:import" :
+      "oscal-complete-oscal-profile:import" : 
       { "title" : "Import resource",
         "description" : "The import designates a catalog, profile, or other resource 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" :
+        "properties" : 
+        { "href" : 
           { "title" : "Catalog or Profile Reference",
             "description" : "A resolvable URL reference to the base catalog or profile that this profile is tailoring.",
             "type" : "string",
             "format" : "uri-reference" },
-          "include-all" :
+          "include-all" : 
           { "$ref" : "#assembly_oscal-profile_include-all" },
-          "include-controls" :
+          "include-controls" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-profile_select-control-by-id" } },
-          "exclude-controls" :
+          "exclude-controls" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-profile_select-control-by-id" } } },
-        "required" :
+        "required" : 
         [ "href" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-profile:merge" :
+      "oscal-complete-oscal-profile:merge" : 
       { "title" : "Merge controls",
         "description" : "A Merge element merges controls in resolution.",
         "$id" : "#assembly_oscal-profile_merge",
         "type" : "object",
-        "properties" :
-        { "combine" :
+        "properties" : 
+        { "combine" : 
           { "$ref" : "#assembly_oscal-profile_combine" },
-          "as-is" :
+          "as-is" : 
           { "$ref" : "#field_oscal-profile_as-is" },
-          "custom" :
+          "custom" : 
           { "$ref" : "#assembly_oscal-profile_custom" } },
         "additionalProperties" : false },
-      "oscal-complete-oscal-profile:combine" :
+      "oscal-complete-oscal-profile:combine" : 
       { "title" : "Combination rule",
         "description" : "A Combine element defines whether and how to combine multiple (competing) versions of the same control",
         "$id" : "#assembly_oscal-profile_combine",
         "type" : "object",
-        "properties" :
-        { "method" :
+        "properties" : 
+        { "method" : 
           { "title" : "Combination method",
             "description" : "How clashing controls should be handled",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$",
-            "enum" :
+            "enum" : 
             [ "use-first",
               "merge",
               "keep" ] } },
         "additionalProperties" : false },
-      "oscal-complete-oscal-profile:as-is" :
+      "oscal-complete-oscal-profile:as-is" : 
       { "title" : "As is",
         "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.",
         "$id" : "#field_oscal-profile_as-is",
         "type" : "boolean" },
-      "oscal-complete-oscal-profile:custom" :
+      "oscal-complete-oscal-profile:custom" : 
       { "title" : "Custom grouping",
         "description" : "A Custom element frames a structure for embedding represented controls in resolution.",
         "$id" : "#assembly_oscal-profile_custom",
         "type" : "object",
-        "properties" :
-        { "groups" :
+        "properties" : 
+        { "groups" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-profile_group" } },
-          "insert-controls" :
+          "insert-controls" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-profile_insert-controls" } } },
         "additionalProperties" : false },
-      "oscal-complete-oscal-profile:group" :
+      "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" :
+        "properties" : 
+        { "id" : 
           { "title" : "Group Identifier",
             "description" : "A unique identifier for a specific group instance that can be used to reference the group within this and in other OSCAL documents. This identifier's uniqueness is document scoped and is intended to be consistent for the same group across minor revisions of the document.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "class" :
+          "class" : 
           { "title" : "Group Class",
             "description" : "A textual label that provides a sub-type or characterization of the group.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "title" :
+          "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" :
+          "params" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-catalog-common_parameter" } },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "parts" :
+          "parts" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-catalog-common_part" } },
-          "groups" :
+          "groups" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-profile_group" } },
-          "insert-controls" :
+          "insert-controls" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-profile_insert-controls" } } },
-        "required" :
+        "required" : 
         [ "title" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-profile:modify" :
+      "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" :
+        "properties" : 
+        { "set-parameters" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Parameter Setting",
               "description" : "A parameter setting, to be propagated to points of insertion",
               "type" : "object",
-              "properties" :
-              { "param-id" :
+              "properties" : 
+              { "param-id" : 
                 { "title" : "Parameter ID",
                   "description" : "Indicates the value of the 'id' flag on a target parameter; i.e. which parameter to set",
                   "type" : "string",
                   "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-                "class" :
+                "class" : 
                 { "title" : "Parameter Class",
                   "description" : "A textual label that provides a characterization of the parameter.",
                   "type" : "string",
                   "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-                "depends-on" :
+                "depends-on" : 
                 { "title" : "Depends on",
                   "description" : "Another parameter invoking this one",
                   "type" : "string",
                   "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "label" :
+                "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" :
+                "usage" : 
                 { "title" : "Parameter Usage Description",
                   "description" : "Describes the purpose and use of a parameter",
                   "type" : "string" },
-                "constraints" :
+                "constraints" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-catalog-common_parameter-constraint" } },
-                "guidelines" :
+                "guidelines" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-catalog-common_parameter-guideline" } },
-                "values" :
+                "values" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#field_oscal-catalog-common_parameter-value" } },
-                "select" :
+                "select" : 
                 { "$ref" : "#assembly_oscal-catalog-common_parameter-selection" } },
-              "required" :
+              "required" : 
               [ "param-id" ],
               "additionalProperties" : false } },
-          "alters" :
+          "alters" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-profile_alter" } } },
         "additionalProperties" : false },
-      "oscal-complete-oscal-profile:insert-controls" :
+      "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" :
+        "properties" : 
+        { "order" : 
           { "title" : "Order",
             "description" : "A designation of how a selection of controls in a profile is to be ordered.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$",
-            "enum" :
+            "enum" : 
             [ "keep",
               "ascending",
               "descending" ] },
-          "include-all" :
+          "include-all" : 
           { "$ref" : "#assembly_oscal-profile_include-all" },
-          "include-controls" :
+          "include-controls" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-profile_select-control-by-id" } },
-          "exclude-controls" :
+          "exclude-controls" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-profile_select-control-by-id" } } },
         "additionalProperties" : false },
-      "oscal-complete-oscal-profile:include-all" :
+      "oscal-complete-oscal-profile:include-all" : 
       { "title" : "Insert All",
         "description" : "Insert all controls from the imported catalog or profile resources identified in the import directive.",
         "$id" : "#assembly_oscal-profile_include-all",
         "type" : "object",
         "additionalProperties" : false },
-      "oscal-complete-oscal-profile:select-control-by-id" :
+      "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" :
+        "properties" : 
+        { "with-child-controls" : 
           { "title" : "Include contained controls with control",
             "description" : "When a control is included, whether its child (dependent) controls are also included.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$",
-            "enum" :
+            "enum" : 
             [ "yes",
               "no" ] },
-          "with-ids" :
+          "with-ids" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Match Controls by Identifier",
               "description" : "",
               "type" : "string",
               "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" } },
-          "matching" :
+          "matching" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Match Controls by Pattern",
               "description" : "Select controls by (regular expression) match on ID",
               "type" : "object",
-              "properties" :
-              { "pattern" :
+              "properties" : 
+              { "pattern" : 
                 { "title" : "Pattern",
                   "description" : "A glob expression matching the IDs of one or more controls to be selected.",
                   "type" : "string",
                   "pattern" : "^\\S(.*\\S)?$" } },
               "additionalProperties" : false } } },
         "additionalProperties" : false },
-      "oscal-complete-oscal-profile:alter" :
+      "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" :
+        "properties" : 
+        { "control-id" : 
           { "title" : "Control Identifier Reference",
             "description" : "A reference to a control with a corresponding id value.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "removes" :
+          "removes" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-profile_remove" } },
-          "adds" :
+          "adds" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-profile_add" } } },
         "additionalProperties" : false },
-      "oscal-complete-oscal-profile:remove" :
+      "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" :
+        "properties" : 
+        { "by-name" : 
           { "title" : "Reference by (assigned) name",
             "description" : "Identify items to remove by matching their assigned name",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "by-class" :
+          "by-class" : 
           { "title" : "Reference by class",
             "description" : "Identify items to remove by matching their class.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "by-id" :
+          "by-id" : 
           { "title" : "Reference by ID",
             "description" : "Identify items to remove indicated by their id.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "by-item-name" :
+          "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",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "by-ns" :
+          "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.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" } },
         "additionalProperties" : false },
-      "oscal-complete-oscal-profile:add" :
+      "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" :
+        "properties" : 
+        { "position" : 
           { "title" : "Position",
             "description" : "Where to add the new content with respect to the targeted element (beside it or inside it)",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$",
-            "enum" :
+            "enum" : 
             [ "before",
               "after",
               "starting",
               "ending" ] },
-          "by-id" :
+          "by-id" : 
           { "title" : "Reference by ID",
             "description" : "Target location of the addition.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "title" :
+          "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" :
+          "params" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-catalog-common_parameter" } },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "parts" :
+          "parts" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-catalog-common_part" } } },
         "additionalProperties" : false },
-      "oscal-complete-oscal-component-definition:component-definition" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Component Definition Universally Unique Identifier",
             "description" : "A globally unique identifier for this component definition instance. This UUID should be changed when this document is revised.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "metadata" :
+          "metadata" : 
           { "$ref" : "#assembly_oscal-metadata_metadata" },
-          "import-component-definitions" :
+          "import-component-definitions" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-component-definition_import-component-definition" } },
-          "components" :
+          "components" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-component-definition_defined-component" } },
-          "capabilities" :
+          "capabilities" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-component-definition_capability" } },
-          "back-matter" :
+          "back-matter" : 
           { "$ref" : "#assembly_oscal-metadata_back-matter" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "metadata" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-component-definition:import-component-definition" :
+      "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" :
+        "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.",
             "type" : "string",
             "format" : "uri-reference" } },
-        "required" :
+        "required" : 
         [ "href" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-component-definition:defined-component" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Component Identifier",
             "description" : "The unique identifier for the component.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "type" :
+          "type" : 
           { "title" : "Component Type",
             "description" : "A category describing the purpose of the component.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "title" :
+          "title" : 
           { "title" : "Component Title",
             "description" : "A human readable name for the component.",
             "type" : "string" },
-          "description" :
+          "description" : 
           { "title" : "Component Description",
             "description" : "A description of the component, including information about its function.",
             "type" : "string" },
-          "purpose" :
+          "purpose" : 
           { "title" : "Purpose",
             "description" : "A summary of the technological or business purpose of the component.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "responsible-roles" :
+          "responsible-roles" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "protocols" :
+          "protocols" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-implementation-common_protocol" } },
-          "control-implementations" :
+          "control-implementations" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-component-definition_control-implementation" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "type",
           "title",
           "description" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-component-definition:capability" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Capability Identifier",
             "description" : "A unique identifier for a capability.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "name" :
+          "name" : 
           { "title" : "Capability Name",
             "description" : "The capability's human-readable name.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "description" :
+          "description" : 
           { "title" : "Capability Description",
             "description" : "A summary of the capability.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "incorporates-components" :
+          "incorporates-components" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-component-definition_incorporates-component" } },
-          "control-implementations" :
+          "control-implementations" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-component-definition_control-implementation" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "name",
           "description" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-component-definition:incorporates-component" :
+      "oscal-complete-oscal-component-definition:incorporates-component" : 
       { "title" : "Incorporates Component",
         "description" : "TBD",
         "$id" : "#assembly_oscal-component-definition_incorporates-component",
         "type" : "object",
-        "properties" :
-        { "component-uuid" :
+        "properties" : 
+        { "component-uuid" : 
           { "title" : "Component Reference",
             "description" : "A reference to a component by its identifier",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "description" :
+          "description" : 
           { "title" : "Component Description",
             "description" : "A description of the component, including information about its function.",
             "type" : "string" } },
-        "required" :
+        "required" : 
         [ "component-uuid",
           "description" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-component-definition:control-implementation" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Control Implementation Set Identifier",
             "description" : "A unique identifier for the set of implemented controls.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "source" :
+          "source" : 
           { "title" : "Source Resource Reference",
             "description" : "A reference to an OSCAL catalog or profile providing the referenced control or subcontrol definition.",
             "type" : "string",
             "format" : "uri-reference" },
-          "description" :
+          "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" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "set-parameters" :
+          "set-parameters" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-implementation-common_set-parameter" } },
-          "implemented-requirements" :
+          "implemented-requirements" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-component-definition_implemented-requirement" } } },
-        "required" :
+        "required" : 
         [ "uuid",
           "source",
           "description",
           "implemented-requirements" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-component-definition:implemented-requirement" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Control Implementation Identifier",
             "description" : "A unique identifier for a specific control implementation.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "control-id" :
+          "control-id" : 
           { "title" : "Control Identifier Reference",
             "description" : "A reference to a control with a corresponding id value.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "description" :
+          "description" : 
           { "title" : "Control Implementation Description",
             "description" : "A description of how the specified control is implemented for the containing component or capability.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "set-parameters" :
+          "set-parameters" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-implementation-common_set-parameter" } },
-          "responsible-roles" :
+          "responsible-roles" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "statements" :
+          "statements" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-component-definition_statement" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "control-id",
           "description" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-component-definition:statement" :
+      "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" :
+        "properties" : 
+        { "statement-id" : 
           { "title" : "Control Statement Reference",
             "description" : "A reference to a control statement by its identifier",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "uuid" :
+          "uuid" : 
           { "title" : "Control Statement Reference Universally Unique Identifier",
             "description" : "A globally unique identifier that can be used to reference this control statement entry elsewhere in an OSCAL document. A UUID should be consistently used for a given resource across revisions of the document.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "description" :
+          "description" : 
           { "title" : "Statement Implementation Description",
             "description" : "A summary of how the containing control statement is implemented by the component or capability.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "responsible-roles" :
+          "responsible-roles" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "statement-id",
           "uuid",
           "description" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-implementation-common:system-component" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Component Identifier",
             "description" : "The unique identifier for the component.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "type" :
+          "type" : 
           { "title" : "Component Type",
             "description" : "A category describing the purpose of the component.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "title" :
+          "title" : 
           { "title" : "Component Title",
             "description" : "A human readable name for the system component.",
             "type" : "string" },
-          "description" :
+          "description" : 
           { "title" : "Component Description",
             "description" : "A description of the component, including information about its function.",
             "type" : "string" },
-          "purpose" :
+          "purpose" : 
           { "title" : "Purpose",
             "description" : "A summary of the technological or business purpose of the component.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "status" :
+          "status" : 
           { "title" : "Status",
             "description" : "Describes the operational status of the system component.",
             "type" : "object",
-            "properties" :
-            { "state" :
+            "properties" : 
+            { "state" : 
               { "title" : "State",
                 "description" : "The operational status.",
                 "type" : "string",
                 "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$",
-                "enum" :
+                "enum" : 
                 [ "under-development",
                   "operational",
                   "disposition",
                   "other" ] },
-              "remarks" :
+              "remarks" : 
               { "$ref" : "#field_oscal-metadata_remarks" } },
-            "required" :
+            "required" : 
             [ "state" ],
             "additionalProperties" : false },
-          "responsible-roles" :
+          "responsible-roles" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "protocols" :
+          "protocols" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-implementation-common_protocol" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "type",
           "title",
           "description",
           "status" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-implementation-common:protocol" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Service Protocol Information Universally Unique Identifier",
             "description" : "A globally unique identifier that can be used to reference this service protocol entry elsewhere in an OSCAL document. A UUID should be consistently used for a given resource across revisions of the document.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "name" :
+          "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.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "title" :
+          "title" : 
           { "title" : "Protocol Title",
             "description" : "A human readable name for the protocol (e.g., Transport Layer Security).",
             "type" : "string" },
-          "port-ranges" :
+          "port-ranges" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-implementation-common_port-range" } } },
-        "required" :
+        "required" : 
         [ "name" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-implementation-common:port-range" :
+      "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" :
+        "properties" : 
+        { "start" : 
           { "title" : "Start",
             "description" : "Indicates the starting port number in a port range",
             "type" : "integer",
             "multipleOf" : 1,
             "minimum" : 0 },
-          "end" :
+          "end" : 
           { "title" : "End",
             "description" : "Indicates the ending port number in a port range",
             "type" : "integer",
             "multipleOf" : 1,
             "minimum" : 0 },
-          "transport" :
+          "transport" : 
           { "title" : "Transport",
             "description" : "Indicates the transport type.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$",
-            "enum" :
+            "enum" : 
             [ "TCP",
               "UDP" ] } },
         "additionalProperties" : false },
-      "oscal-complete-oscal-implementation-common:implementation-status" :
+      "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" :
+        "properties" : 
+        { "state" : 
           { "title" : "Implementation State",
             "description" : "Identifies the implementation status of the control or control objective.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "state" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-implementation-common:system-user" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "User Universally Unique Identifier",
             "description" : "The unique identifier for the user class.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "title" :
+          "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" :
+          "short-name" : 
           { "title" : "User Short Name",
             "description" : "A short common name, abbreviation, or acronym for the user.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "description" :
+          "description" : 
           { "title" : "User Description",
             "description" : "A summary of the user's purpose within the system.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "role-ids" :
+          "role-ids" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-metadata_role-id" } },
-          "authorized-privileges" :
+          "authorized-privileges" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-implementation-common_authorized-privilege" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-implementation-common:authorized-privilege" :
+      "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" :
+        "properties" : 
+        { "title" : 
           { "title" : "Privilege Title",
             "description" : "A human readable name for the privilege.",
             "type" : "string" },
-          "description" :
+          "description" : 
           { "title" : "Privilege Description",
             "description" : "A summary of the privilege's purpose within the system.",
             "type" : "string" },
-          "functions-performed" :
+          "functions-performed" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-implementation-common_function-performed" } } },
-        "required" :
+        "required" : 
         [ "title",
           "functions-performed" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-implementation-common:function-performed" :
+      "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",
         "type" : "string",
         "pattern" : "^\\S(.*\\S)?$" },
-      "oscal-complete-oscal-implementation-common:inventory-item" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Inventory Item Universally Unique Identifier",
             "description" : "A globally unique identifier that can be used to reference this inventory item entry elsewhere in an OSCAL document. A UUID should be consistently used for a given resource across revisions of the document.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "description" :
+          "description" : 
           { "title" : "Inventory Item Description",
             "description" : "A summary of the inventory item stating its purpose within the system.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "responsible-parties" :
+          "responsible-parties" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-          "implemented-components" :
+          "implemented-components" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Implemented Component",
               "description" : "The set of components that are implemented in a given system inventory item.",
               "type" : "object",
-              "properties" :
-              { "component-uuid" :
+              "properties" : 
+              { "component-uuid" : 
                 { "title" : "Component Universally Unique Identifier Reference",
                   "description" : "A reference to a component that is implemented as part of an inventory item.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "responsible-parties" :
+                "responsible-parties" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "component-uuid" ],
               "additionalProperties" : false } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "description" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-implementation-common:set-parameter" :
+      "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" :
+        "properties" : 
+        { "param-id" : 
           { "title" : "Parameter ID",
             "description" : "A reference to a parameter within a control, who's catalog has been imported into the current implementation context.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "values" :
+          "values" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Parameter Value",
               "description" : "A parameter value or set of values.",
               "type" : "string",
               "pattern" : "^\\S(.*\\S)?$" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "param-id",
           "values" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-implementation-common:system-id" :
+      "oscal-complete-oscal-implementation-common:system-id" : 
       { "title" : "System Identification",
         "description" : "A unique identifier for the system described by this system security plan.",
         "$id" : "#field_oscal-implementation-common_system-id",
         "type" : "object",
-        "properties" :
-        { "identifier-type" :
+        "properties" : 
+        { "identifier-type" : 
           { "title" : "Identification System Type",
             "description" : "Identifies the identification system from which the provided identifier was assigned.",
             "type" : "string",
             "format" : "uri" },
-          "id" :
+          "id" : 
           { "type" : "string" } },
-        "required" :
+        "required" : 
         [ "id" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-ssp:system-security-plan" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "System Security Plan Universally Unique Identifier",
             "description" : "A globally unique identifier for this catalog instance. This UUID should be changed when this document is revised.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "metadata" :
+          "metadata" : 
           { "$ref" : "#assembly_oscal-metadata_metadata" },
-          "import-profile" :
+          "import-profile" : 
           { "$ref" : "#assembly_oscal-ssp_import-profile" },
-          "system-characteristics" :
+          "system-characteristics" : 
           { "$ref" : "#assembly_oscal-ssp_system-characteristics" },
-          "system-implementation" :
+          "system-implementation" : 
           { "$ref" : "#assembly_oscal-ssp_system-implementation" },
-          "control-implementation" :
+          "control-implementation" : 
           { "$ref" : "#assembly_oscal-ssp_control-implementation" },
-          "back-matter" :
+          "back-matter" : 
           { "$ref" : "#assembly_oscal-metadata_back-matter" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "metadata",
           "import-profile",
@@ -2075,84 +2075,84 @@
           "system-implementation",
           "control-implementation" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-ssp:import-profile" :
+      "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" :
+        "properties" : 
+        { "href" : 
           { "title" : "Profile Reference",
             "description" : "A resolvable URL reference to the profile to use as the system's control baseline.",
             "type" : "string",
             "format" : "uri-reference" },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "href" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-ssp:system-characteristics" :
+      "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" :
+        "properties" : 
+        { "system-ids" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-implementation-common_system-id" } },
-          "system-name" :
+          "system-name" : 
           { "title" : "System Name - Full",
             "description" : "The full name of the system.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "system-name-short" :
+          "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.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "description" :
+          "description" : 
           { "title" : "System Description",
             "description" : "A summary of the system.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "date-authorized" :
+          "date-authorized" : 
           { "$ref" : "#field_oscal-ssp_date-authorized" },
-          "security-sensitivity-level" :
+          "security-sensitivity-level" : 
           { "title" : "Security Sensitivity Level",
             "description" : "The overall information system sensitivity categorization, such as defined by FIPS-199.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "system-information" :
+          "system-information" : 
           { "$ref" : "#assembly_oscal-ssp_system-information" },
-          "security-impact-level" :
+          "security-impact-level" : 
           { "$ref" : "#assembly_oscal-ssp_security-impact-level" },
-          "status" :
+          "status" : 
           { "$ref" : "#assembly_oscal-ssp_status" },
-          "authorization-boundary" :
+          "authorization-boundary" : 
           { "$ref" : "#assembly_oscal-ssp_authorization-boundary" },
-          "network-architecture" :
+          "network-architecture" : 
           { "$ref" : "#assembly_oscal-ssp_network-architecture" },
-          "data-flow" :
+          "data-flow" : 
           { "$ref" : "#assembly_oscal-ssp_data-flow" },
-          "responsible-parties" :
+          "responsible-parties" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "system-ids",
           "system-name",
           "description",
@@ -2162,2894 +2162,2896 @@
           "status",
           "authorization-boundary" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-ssp:system-information" :
+      "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" :
+        "properties" : 
+        { "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "information-types" :
+          "information-types" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "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" :
+              "properties" : 
+              { "uuid" : 
                 { "title" : "Information Type Universally Unique Identifier",
                   "description" : "A globally unique identifier that can be used to reference this information type entry elsewhere in an OSCAL document. A UUID should be consistently used for a given resource across revisions of the document.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "title" :
+                "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" :
+                "description" : 
                 { "title" : "Information Type Description",
                   "description" : "A summary of how this information type is used within the system.",
                   "type" : "string" },
-                "categorizations" :
+                "categorizations" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "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" :
+                    "properties" : 
+                    { "system" : 
                       { "title" : "Information Type Identification System",
                         "description" : "Specifies the information type identification system used.",
                         "type" : "string",
                         "format" : "uri" },
-                      "information-type-ids" :
+                      "information-type-ids" : 
                       { "type" : "array",
                         "minItems" : 1,
-                        "items" :
+                        "items" : 
                         { "title" : "Information Type Systematized Identifier",
                           "description" : "An identifier qualified by the given identification system used, such as NIST SP 800-60.",
                           "type" : "string",
                           "pattern" : "^\\S(.*\\S)?$" } } },
-                    "required" :
+                    "required" : 
                     [ "system" ],
                     "additionalProperties" : false } },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "confidentiality-impact" :
+                "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" :
+                  "properties" : 
+                  { "props" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "$ref" : "#assembly_oscal-metadata_property" } },
-                    "links" :
+                    "links" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "$ref" : "#assembly_oscal-metadata_link" } },
-                    "base" :
+                    "base" : 
                     { "$ref" : "#field_oscal-ssp_base" },
-                    "selected" :
+                    "selected" : 
                     { "$ref" : "#field_oscal-ssp_selected" },
-                    "adjustment-justification" :
+                    "adjustment-justification" : 
                     { "$ref" : "#field_oscal-ssp_adjustment-justification" } },
-                  "required" :
+                  "required" : 
                   [ "base" ],
                   "additionalProperties" : false },
-                "integrity-impact" :
+                "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" :
+                  "properties" : 
+                  { "props" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "$ref" : "#assembly_oscal-metadata_property" } },
-                    "links" :
+                    "links" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "$ref" : "#assembly_oscal-metadata_link" } },
-                    "base" :
+                    "base" : 
                     { "$ref" : "#field_oscal-ssp_base" },
-                    "selected" :
+                    "selected" : 
                     { "$ref" : "#field_oscal-ssp_selected" },
-                    "adjustment-justification" :
+                    "adjustment-justification" : 
                     { "$ref" : "#field_oscal-ssp_adjustment-justification" } },
-                  "required" :
+                  "required" : 
                   [ "base" ],
                   "additionalProperties" : false },
-                "availability-impact" :
+                "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" :
+                  "properties" : 
+                  { "props" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "$ref" : "#assembly_oscal-metadata_property" } },
-                    "links" :
+                    "links" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "$ref" : "#assembly_oscal-metadata_link" } },
-                    "base" :
+                    "base" : 
                     { "$ref" : "#field_oscal-ssp_base" },
-                    "selected" :
+                    "selected" : 
                     { "$ref" : "#field_oscal-ssp_selected" },
-                    "adjustment-justification" :
+                    "adjustment-justification" : 
                     { "$ref" : "#field_oscal-ssp_adjustment-justification" } },
-                  "required" :
+                  "required" : 
                   [ "base" ],
                   "additionalProperties" : false } },
-              "required" :
+              "required" : 
               [ "title",
                 "description",
                 "confidentiality-impact",
                 "integrity-impact",
                 "availability-impact" ],
               "additionalProperties" : false } } },
-        "required" :
+        "required" : 
         [ "information-types" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-ssp:base" :
+      "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",
         "type" : "string",
         "pattern" : "^\\S(.*\\S)?$" },
-      "oscal-complete-oscal-ssp:selected" :
+      "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",
         "type" : "string",
         "pattern" : "^\\S(.*\\S)?$" },
-      "oscal-complete-oscal-ssp:adjustment-justification" :
+      "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" :
+      "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" :
+        "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.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "security-objective-integrity" :
+          "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.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "security-objective-availability" :
+          "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.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" } },
-        "required" :
+        "required" : 
         [ "security-objective-confidentiality",
           "security-objective-integrity",
           "security-objective-availability" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-ssp:status" :
+      "oscal-complete-oscal-ssp:status" : 
       { "title" : "Status",
         "description" : "Describes the operational status of the system.",
         "$id" : "#assembly_oscal-ssp_status",
         "type" : "object",
-        "properties" :
-        { "state" :
+        "properties" : 
+        { "state" : 
           { "title" : "State",
             "description" : "The current operating status.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$",
-            "enum" :
+            "enum" : 
             [ "operational",
               "under-development",
               "under-major-modification",
               "disposition",
               "other" ] },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "state" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-ssp:date-authorized" :
+      "oscal-complete-oscal-ssp:date-authorized" : 
       { "title" : "System Authorization Date",
         "description" : "The date the system received its authorization.",
         "$id" : "#field_oscal-ssp_date-authorized",
         "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})?$" },
-      "oscal-complete-oscal-ssp:authorization-boundary" :
+      "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" :
+        "properties" : 
+        { "description" : 
           { "title" : "Authorization Boundary Description",
             "description" : "A summary of the system's authorization boundary.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "diagrams" :
+          "diagrams" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-ssp_diagram" } },
-          "remarks" :
+          "remarks" : 
           { "title" : "remarks field",
             "description" : "Commentary about the system's authorization boundary that enhances the diagram.",
             "type" : "string" } },
-        "required" :
+        "required" : 
         [ "description" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-ssp:diagram" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Diagram ID",
             "description" : "The identifier for this diagram.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "description" :
+          "description" : 
           { "title" : "Diagram Description",
             "description" : "A summary of the diagram.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "caption" :
+          "caption" : 
           { "title" : "Caption",
             "description" : "A brief caption to annotate the diagram.",
             "type" : "string" },
-          "remarks" :
+          "remarks" : 
           { "title" : "remarks field",
             "description" : "Commentary about the diagram that enhances it.",
             "type" : "string" } },
-        "required" :
+        "required" : 
         [ "uuid" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-ssp:network-architecture" :
+      "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" :
+        "properties" : 
+        { "description" : 
           { "title" : "Network Architecture Description",
             "description" : "A summary of the system's network architecture.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "diagrams" :
+          "diagrams" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-ssp_diagram" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "description" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-ssp:data-flow" :
+      "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" :
+        "properties" : 
+        { "description" : 
           { "title" : "Data Flow Description",
             "description" : "A summary of the system's data flow.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "diagrams" :
+          "diagrams" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-ssp_diagram" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "description" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-ssp:system-implementation" :
+      "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" :
+        "properties" : 
+        { "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "leveraged-authorizations" :
+          "leveraged-authorizations" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "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" :
+              "properties" : 
+              { "uuid" : 
                 { "title" : "Leveraged Authorization Universally Unique Identifier",
                   "description" : "A globally unique identifier that can be used to reference this leveraged authorization entry elsewhere in an OSCAL document. A UUID should be consistently used for a given resource across revisions of the document.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "title" :
+                "title" : 
                 { "title" : "title field",
                   "description" : "A human readable name for the leveraged authorization in the context of the system.",
                   "type" : "string" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "party-uuid" :
+                "party-uuid" : 
                 { "title" : "party-uuid field",
                   "description" : "A reference to the party that manages the leveraged system.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "date-authorized" :
+                "date-authorized" : 
                 { "$ref" : "#field_oscal-ssp_date-authorized" },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "uuid",
                 "title",
                 "party-uuid",
                 "date-authorized" ],
               "additionalProperties" : false } },
-          "users" :
+          "users" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-implementation-common_system-user" } },
-          "components" :
+          "components" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-implementation-common_system-component" } },
-          "inventory-items" :
+          "inventory-items" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-implementation-common_inventory-item" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "users",
           "components" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-ssp:control-implementation" :
+      "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" :
+        "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" :
+          "set-parameters" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-implementation-common_set-parameter" } },
-          "implemented-requirements" :
+          "implemented-requirements" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-ssp_implemented-requirement" } } },
-        "required" :
+        "required" : 
         [ "description",
           "implemented-requirements" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-ssp:implemented-requirement" :
+      "oscal-complete-oscal-ssp:implemented-requirement" : 
       { "title" : "Control-based Requirement",
         "description" : "Describes how the system satisfies an individual control.",
         "$id" : "#assembly_oscal-ssp_implemented-requirement",
         "type" : "object",
-        "properties" :
-        { "uuid" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Control Requirement Universally Unique Identifier",
             "description" : "A globally unique identifier that can be used to reference this control requirement entry elsewhere in an OSCAL document. A UUID should be consistently used for a given resource across revisions of the document.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "control-id" :
+          "control-id" : 
           { "title" : "Control Identifier Reference",
             "description" : "A reference to a control with a corresponding id value.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "set-parameters" :
+          "set-parameters" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-implementation-common_set-parameter" } },
-          "responsible-roles" :
+          "responsible-roles" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "statements" :
+          "statements" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-ssp_statement" } },
-          "by-components" :
+          "by-components" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-ssp_by-component" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "control-id" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-ssp:statement" :
+      "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" :
+        "properties" : 
+        { "statement-id" : 
           { "title" : "Control Statement Reference",
             "description" : "A reference to a control statement by its identifier",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "uuid" :
+          "uuid" : 
           { "title" : "Control Statement Reference Universally Unique Identifier",
             "description" : "A globally unique identifier that can be used to reference this control statement entry elsewhere in an OSCAL document. A UUID should be consistently used for a given resource across revisions of the document.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "responsible-roles" :
+          "responsible-roles" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "by-components" :
+          "by-components" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-ssp_by-component" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "statement-id",
           "uuid" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-ssp:by-component" :
+      "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" :
+        "properties" : 
+        { "component-uuid" : 
           { "title" : "Component Universally Unique Identifier Reference",
             "description" : "A reference to the component that is implementing a given control or control statement.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "uuid" :
+          "uuid" : 
           { "title" : "By-Component Universally Unique Identifier",
             "description" : "A globally unique identifier that can be used to reference this by-component entry elsewhere in an OSCAL document. A UUID should be consistently used for a given resource across revisions of the document.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "description" :
+          "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" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "set-parameters" :
+          "set-parameters" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-implementation-common_set-parameter" } },
-          "implementation-status" :
+          "implementation-status" : 
           { "$ref" : "#assembly_oscal-implementation-common_implementation-status" },
-          "export" :
+          "export" : 
           { "title" : "Export",
             "description" : "Identifies content intended for external consumption, such as with leveraged organizations.",
             "type" : "object",
-            "properties" :
-            { "description" :
+            "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" :
+              "props" : 
               { "type" : "array",
                 "minItems" : 1,
-                "items" :
+                "items" : 
                 { "$ref" : "#assembly_oscal-metadata_property" } },
-              "links" :
+              "links" : 
               { "type" : "array",
                 "minItems" : 1,
-                "items" :
+                "items" : 
                 { "$ref" : "#assembly_oscal-metadata_link" } },
-              "provided" :
+              "provided" : 
               { "type" : "array",
                 "minItems" : 1,
-                "items" :
+                "items" : 
                 { "title" : "Provided Control Implementation",
                   "description" : "Describes a capability which may be inherited by a leveraging system.",
                   "type" : "object",
-                  "properties" :
-                  { "uuid" :
+                  "properties" : 
+                  { "uuid" : 
                     { "title" : "Provided Universally Unique Identifier",
                       "description" : "A globally unique identifier that can be used to reference this provided entry elsewhere in an OSCAL document. A UUID should be consistently used for a given resource across revisions of the document.",
                       "type" : "string",
                       "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                    "description" :
+                    "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" :
+                    "props" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "$ref" : "#assembly_oscal-metadata_property" } },
-                    "links" :
+                    "links" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "$ref" : "#assembly_oscal-metadata_link" } },
-                    "responsible-roles" :
+                    "responsible-roles" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-                    "remarks" :
+                    "remarks" : 
                     { "$ref" : "#field_oscal-metadata_remarks" } },
-                  "required" :
+                  "required" : 
                   [ "uuid",
                     "description" ],
                   "additionalProperties" : false } },
-              "responsibilities" :
+              "responsibilities" : 
               { "type" : "array",
                 "minItems" : 1,
-                "items" :
+                "items" : 
                 { "title" : "Control Implementation Responsibility",
                   "description" : "Describes a control implementation responsibility imposed on a leveraging system.",
                   "type" : "object",
-                  "properties" :
-                  { "uuid" :
+                  "properties" : 
+                  { "uuid" : 
                     { "title" : "Responsibility Universally Unique Identifier",
                       "description" : "A globally unique identifier that can be used to reference this responsibility entry elsewhere in an OSCAL document. A UUID should be consistently used for a given resource across revisions of the document.",
                       "type" : "string",
                       "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                    "provided-uuid" :
+                    "provided-uuid" : 
                     { "title" : "Provided UUID",
                       "description" : "Identifies a 'provided' assembly associated with this assembly.",
                       "type" : "string",
                       "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                    "description" :
+                    "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" :
+                    "props" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "$ref" : "#assembly_oscal-metadata_property" } },
-                    "links" :
+                    "links" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "$ref" : "#assembly_oscal-metadata_link" } },
-                    "responsible-roles" :
+                    "responsible-roles" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-                    "remarks" :
+                    "remarks" : 
                     { "$ref" : "#field_oscal-metadata_remarks" } },
-                  "required" :
+                  "required" : 
                   [ "uuid",
                     "description" ],
                   "additionalProperties" : false } },
-              "remarks" :
+              "remarks" : 
               { "$ref" : "#field_oscal-metadata_remarks" } },
             "additionalProperties" : false },
-          "inherited" :
+          "inherited" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Inherited Control Implementation",
               "description" : "Describes a control implementation inherited by a leveraging system.",
               "type" : "object",
-              "properties" :
-              { "uuid" :
+              "properties" : 
+              { "uuid" : 
                 { "title" : "Inherited Universally Unique Identifier",
                   "description" : "A globally unique identifier that can be used to reference this inherited entry elsewhere in an OSCAL document. A UUID should be consistently used for a given resource across revisions of the document.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "provided-uuid" :
+                "provided-uuid" : 
                 { "title" : "Provided UUID",
                   "description" : "Identifies a 'provided' assembly associated with this assembly.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "description" :
+                "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" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "responsible-roles" :
+                "responsible-roles" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_responsible-role" } } },
-              "required" :
+              "required" : 
               [ "uuid",
                 "description" ],
               "additionalProperties" : false } },
-          "satisfied" :
+          "satisfied" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Satisfied Control Implementation Responsibility",
               "description" : "Describes how this system satisfies a responsibility imposed by a leveraged system.",
               "type" : "object",
-              "properties" :
-              { "uuid" :
+              "properties" : 
+              { "uuid" : 
                 { "title" : "Satisfied Universally Unique Identifier",
                   "description" : "A globally unique identifier that can be used to reference this satisfied entry elsewhere in an OSCAL document. A UUID should be consistently used for a given resource across revisions of the document.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "responsibility-uuid" :
+                "responsibility-uuid" : 
                 { "title" : "Provided UUID",
                   "description" : "Identifies a 'provided' assembly associated with this assembly.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "description" :
+                "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" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "responsible-roles" :
+                "responsible-roles" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "uuid",
                 "description" ],
               "additionalProperties" : false } },
-          "responsible-roles" :
+          "responsible-roles" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "component-uuid",
           "uuid",
           "description" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-ap:assessment-plan" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Assessment Plan Universally Unique Identifier",
             "description" : "Uniquely identifies this assessment plan. This UUID must be changed each time the content of the plan changes.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "metadata" :
+          "metadata" : 
           { "$ref" : "#assembly_oscal-metadata_metadata" },
-          "import-ssp" :
+          "import-ssp" : 
           { "$ref" : "#assembly_oscal-assessment-common_import-ssp" },
-          "local-definitions" :
+          "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" :
+            "properties" : 
+            { "components" : 
               { "type" : "array",
                 "minItems" : 1,
-                "items" :
+                "items" : 
                 { "$ref" : "#assembly_oscal-implementation-common_system-component" } },
-              "inventory-items" :
+              "inventory-items" : 
               { "type" : "array",
                 "minItems" : 1,
-                "items" :
+                "items" : 
                 { "$ref" : "#assembly_oscal-implementation-common_inventory-item" } },
-              "users" :
+              "users" : 
               { "type" : "array",
                 "minItems" : 1,
-                "items" :
+                "items" : 
                 { "$ref" : "#assembly_oscal-implementation-common_system-user" } },
-              "objectives-and-methods" :
+              "objectives-and-methods" : 
               { "type" : "array",
                 "minItems" : 1,
-                "items" :
+                "items" : 
                 { "$ref" : "#assembly_oscal-assessment-common_local-objective" } },
-              "activities" :
+              "activities" : 
               { "type" : "array",
                 "minItems" : 1,
-                "items" :
+                "items" : 
                 { "$ref" : "#assembly_oscal-assessment-common_activity" } },
-              "remarks" :
+              "remarks" : 
               { "$ref" : "#field_oscal-metadata_remarks" } },
             "additionalProperties" : false },
-          "terms-and-conditions" :
+          "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" :
+            "properties" : 
+            { "parts" : 
               { "type" : "array",
                 "minItems" : 1,
-                "items" :
+                "items" : 
                 { "$ref" : "#assembly_oscal-assessment-common_assessment-part" } } },
             "additionalProperties" : false },
-          "reviewed-controls" :
+          "reviewed-controls" : 
           { "$ref" : "#assembly_oscal-assessment-common_reviewed-controls" },
-          "assessment-subjects" :
+          "assessment-subjects" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
-          "assessment-assets" :
+          "assessment-assets" : 
           { "$ref" : "#assembly_oscal-assessment-common_assessment-assets" },
-          "tasks" :
+          "tasks" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_task" } },
-          "back-matter" :
+          "back-matter" : 
           { "$ref" : "#assembly_oscal-metadata_back-matter" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "metadata",
           "import-ssp",
           "reviewed-controls" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:import-ssp" :
+      "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" :
+        "properties" : 
+        { "href" : 
           { "title" : "System Security Plan Reference",
             "description" : ">A resolvable URL reference to the system security plan for the system being assessed.",
             "type" : "string",
             "format" : "uri-reference" },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "href" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:local-objective" :
+      "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" :
+        "properties" : 
+        { "control-id" : 
           { "title" : "Control Identifier Reference",
             "description" : "A reference to a control with a corresponding id value.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "description" :
+          "description" : 
           { "title" : "Objective Description",
             "description" : "A human-readable description of this control objective.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "parts" :
+          "parts" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-catalog-common_part" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "control-id",
           "parts" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:assessment-method" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Assessment Method Universally Unique Identifier",
             "description" : "Uniquely identifies this defined assessment method. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. A UUID should be consistently used for a given assessment method across revisions of the document.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "description" :
+          "description" : 
           { "title" : "Assessment Method Description",
             "description" : "A human-readable description of this assessment method.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "part" :
+          "part" : 
           { "$ref" : "#assembly_oscal-assessment-common_assessment-part" },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "part" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:activity" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Assessment Activity Universally Unique Identifier",
             "description" : "Uniquely identifies this assessment activity. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. A UUID should be consistently used for a given included activity across revisions of the document.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "title" :
+          "title" : 
           { "title" : "Included Activity Title",
             "description" : "The title for this included activity.",
             "type" : "string" },
-          "description" :
+          "description" : 
           { "title" : "Included Activity Description",
             "description" : "A human-readable description of this included activity.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "steps" :
+          "steps" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "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" :
+              "properties" : 
+              { "uuid" : 
                 { "title" : "Step Universally Unique Identifier",
                   "description" : "Uniquely identifies a step. This UUID may be referenced elsewhere in an OSCAL document when referring to this step. A UUID should be consistently used for a given test step across revisions of the document.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "title" :
+                "title" : 
                 { "title" : "Step Title",
                   "description" : "The title for this step.",
                   "type" : "string" },
-                "description" :
+                "description" : 
                 { "title" : "Step Description",
                   "description" : "A human-readable description of this step.",
                   "type" : "string" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "reviewed-controls" :
+                "reviewed-controls" : 
                 { "$ref" : "#assembly_oscal-assessment-common_reviewed-controls" },
-                "responsible-roles" :
+                "responsible-roles" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "uuid",
                 "description" ],
               "additionalProperties" : false } },
-          "related-controls" :
+          "related-controls" : 
           { "$ref" : "#assembly_oscal-assessment-common_reviewed-controls" },
-          "responsible-roles" :
+          "responsible-roles" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "description" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:task" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Task Universally Unique Identifier",
             "description" : "Uniquely identifies this assessment task.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "type" :
+          "type" : 
           { "title" : "Task Type",
             "description" : "The type of task.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "title" :
+          "title" : 
           { "title" : "Task Title",
             "description" : "The title for this task.",
             "type" : "string" },
-          "description" :
+          "description" : 
           { "title" : "Task Description",
             "description" : "A human-readable description of this task.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "timing" :
+          "timing" : 
           { "title" : "Event Timing",
             "description" : "The timing under which the task is intended to occur.",
             "type" : "object",
-            "properties" :
-            { "on-date" :
+            "properties" : 
+            { "on-date" : 
               { "title" : "On Date Condition",
                 "description" : "The task is intended to occur on the specified date.",
                 "type" : "object",
-                "properties" :
-                { "date" :
+                "properties" : 
+                { "date" : 
                   { "title" : "On Date Condition",
                     "description" : "The task must occur on the specified date.",
                     "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-9]{2}:[0-9]{2})$" } },
-                "required" :
+                "required" : 
                 [ "date" ],
                 "additionalProperties" : false },
-              "within-date-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" :
+                "properties" : 
+                { "start" : 
                   { "title" : "Start Date Condition",
                     "description" : "The task must occur on or after the specified date.",
                     "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-9]{2}:[0-9]{2})$" },
-                  "end" :
+                  "end" : 
                   { "title" : "End Date Condition",
                     "description" : "The task must occur on or before the specified date.",
                     "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-9]{2}:[0-9]{2})$" } },
-                "required" :
+                "required" : 
                 [ "start",
                   "end" ],
                 "additionalProperties" : false },
-              "at-frequency" :
+              "at-frequency" : 
               { "title" : "Frequency Condition",
                 "description" : "The task is intended to occur at the specified frequency.",
                 "type" : "object",
-                "properties" :
-                { "period" :
+                "properties" : 
+                { "period" : 
                   { "title" : "Period",
                     "description" : "The task must occur after the specified period has elapsed.",
                     "type" : "integer",
                     "multipleOf" : 1,
                     "minimum" : 1 },
-                  "unit" :
+                  "unit" : 
                   { "title" : "Time Unit",
                     "description" : "The unit of time for the period.",
                     "type" : "string",
                     "pattern" : "^\\S(.*\\S)?$",
-                    "enum" :
+                    "enum" : 
                     [ "seconds",
                       "minutes",
                       "hours",
                       "days",
                       "months",
                       "years" ] } },
-                "required" :
+                "required" : 
                 [ "period",
                   "unit" ],
                 "additionalProperties" : false } },
             "additionalProperties" : false },
-          "dependencies" :
+          "dependencies" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Task Dependency",
               "description" : "Used to indicate that a task is dependent on another task.",
               "type" : "object",
-              "properties" :
-              { "task-uuid" :
+              "properties" : 
+              { "task-uuid" : 
                 { "title" : "Task Universally Unique Identifier Reference",
                   "description" : "References a unique task by UUID.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "task-uuid" ],
               "additionalProperties" : false } },
-          "tasks" :
+          "tasks" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_task" } },
-          "associated-activities" :
+          "associated-activities" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Associated Activity",
               "description" : "Identifies an individual activity to be performed as part of a task.",
               "type" : "object",
-              "properties" :
-              { "activity-uuid" :
+              "properties" : 
+              { "activity-uuid" : 
                 { "title" : "Activity Universally Unique Identifier Reference",
                   "description" : "References an activity defined in the list of activities.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "responsible-roles" :
+                "responsible-roles" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-                "subjects" :
+                "subjects" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "activity-uuid",
                 "subjects" ],
               "additionalProperties" : false } },
-          "subjects" :
+          "subjects" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
-          "responsible-roles" :
+          "responsible-roles" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "type",
           "title" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:reviewed-controls" :
+      "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" :
+        "properties" : 
+        { "description" : 
           { "title" : "Control Objective Description",
             "description" : "A human-readable description of control objectives.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "control-selections" :
+          "control-selections" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "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" :
+              "properties" : 
+              { "description" : 
                 { "title" : "Assessed Controls Description",
                   "description" : "A human-readable description of in-scope controls specified for assessment.",
                   "type" : "string" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "include-all" :
+                "include-all" : 
                 { "title" : "All",
                   "description" : "A key word to indicate all.",
                   "type" : "object",
                   "additionalProperties" : false },
-                "include-controls" :
+                "include-controls" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-assessment-common_select-control-by-id" } },
-                "exclude-controls" :
+                "exclude-controls" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-assessment-common_select-control-by-id" } },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
               "additionalProperties" : false } },
-          "control-objective-selections" :
+          "control-objective-selections" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "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" :
+              "properties" : 
+              { "description" : 
                 { "title" : "Control Objectives Description",
                   "description" : "A human-readable description of this collection of control objectives.",
                   "type" : "string" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "include-all" :
+                "include-all" : 
                 { "title" : "All",
                   "description" : "A key word to indicate all.",
                   "type" : "object",
                   "additionalProperties" : false },
-                "include-objectives" :
+                "include-objectives" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-assessment-common_select-objective-by-id" } },
-                "exclude-objectives" :
+                "exclude-objectives" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-assessment-common_select-objective-by-id" } },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
               "additionalProperties" : false } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "control-selections" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:select-control-by-id" :
+      "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" :
+        "properties" : 
+        { "control-id" : 
           { "title" : "Control Identifier Reference",
             "description" : "A reference to a control with a corresponding id value.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "statement-ids" :
+          "statement-ids" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Include Specific Statements",
               "description" : "Used to constrain the selection to only specificity identified statements.",
               "type" : "string",
               "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" } } },
-        "required" :
+        "required" : 
         [ "control-id" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:select-objective-by-id" :
+      "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" :
+        "properties" : 
+        { "objective-id" : 
           { "title" : "Objective ID",
             "description" : "Points to an assessment objective.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" } },
-        "required" :
+        "required" : 
         [ "objective-id" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:assessment-subject-placeholder" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Assessment Subject Placeholder Universally Unique Identifier",
             "description" : "Uniquely identifies a set of assessment subjects that will be identified by a task or an activity that is part of a task.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "description" :
+          "description" : 
           { "title" : "Assessment Subject Placeholder Description",
             "description" : "A human-readable description of intent of this assessment subject placeholder.",
             "type" : "string" },
-          "sources" :
+          "sources" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Assessment Subject Source",
               "description" : "Assessment subjects will be identified while conducting the referenced activity-instance.",
               "type" : "object",
-              "properties" :
-              { "task-uuid" :
+              "properties" : 
+              { "task-uuid" : 
                 { "title" : "Task Universally Unique Identifier",
                   "description" : "Uniquely identifies an assessment activity to be performed as part of the event. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. A UUID should be consistently used for this schedule across revisions of the document.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" } },
-              "required" :
+              "required" : 
               [ "task-uuid" ],
               "additionalProperties" : false } },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "sources" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:assessment-subject" :
+      "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" :
+        "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.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "description" :
+          "description" : 
           { "title" : "Include Subjects Description",
             "description" : "A human-readable description of the collection of subjects being included in this assessment.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "include-all" :
+          "include-all" : 
           { "title" : "All",
             "description" : "A key word to indicate all.",
             "type" : "object",
             "additionalProperties" : false },
-          "include-subjects" :
+          "include-subjects" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_select-subject-by-id" } },
-          "exclude-subjects" :
+          "exclude-subjects" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_select-subject-by-id" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "type" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:select-subject-by-id" :
+      "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" :
+        "properties" : 
+        { "subject-uuid" : 
           { "title" : "Subject Universally Unique Identifier Reference",
             "description" : "A pointer to a component, inventory-item, location, party, user, or resource using it's UUID.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "type" :
+          "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.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "subject-uuid",
           "type" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:subject-reference" :
+      "oscal-complete-oscal-assessment-common:subject-reference" : 
       { "title" : "Identifies the Subject",
         "description" : "A pointer to a resource based on its universally unique identifier (UUID). 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" :
+        "properties" : 
+        { "subject-uuid" : 
           { "title" : "Subject Universally Unique Identifier Reference",
             "description" : "A pointer to a component, inventory-item, location, party, user, or resource using it's UUID.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "type" :
+          "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.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "title" :
+          "title" : 
           { "title" : "Subject Reference Title",
             "description" : "The title or name for the referenced subject.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "subject-uuid",
           "type" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:assessment-assets" :
+      "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" :
+        "properties" : 
+        { "components" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-implementation-common_system-component" } },
-          "assessment-platforms" :
+          "assessment-platforms" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Assessment Platform",
               "description" : "Used to represent the toolset used to perform aspects of the assessment.",
               "type" : "object",
-              "properties" :
-              { "uuid" :
+              "properties" : 
+              { "uuid" : 
                 { "title" : "Assessment Platform Universally Unique Identifier",
                   "description" : "Uniquely identifies this assessment Platform.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "title" :
+                "title" : 
                 { "title" : "Assessment Platform Title",
                   "description" : "The title or name for the assessment platform.",
                   "type" : "string" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "uses-components" :
+                "uses-components" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "title" : "Uses Component",
                     "description" : "The set of components that are used by the assessment platform.",
                     "type" : "object",
-                    "properties" :
-                    { "component-uuid" :
+                    "properties" : 
+                    { "component-uuid" : 
                       { "title" : "Component Universally Unique Identifier Reference",
                         "description" : "A reference to a component that is implemented as part of an inventory item.",
                         "type" : "string",
                         "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                      "props" :
+                      "props" : 
                       { "type" : "array",
                         "minItems" : 1,
-                        "items" :
+                        "items" : 
                         { "$ref" : "#assembly_oscal-metadata_property" } },
-                      "links" :
+                      "links" : 
                       { "type" : "array",
                         "minItems" : 1,
-                        "items" :
+                        "items" : 
                         { "$ref" : "#assembly_oscal-metadata_link" } },
-                      "responsible-parties" :
+                      "responsible-parties" : 
                       { "type" : "array",
                         "minItems" : 1,
-                        "items" :
+                        "items" : 
                         { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-                      "remarks" :
+                      "remarks" : 
                       { "$ref" : "#field_oscal-metadata_remarks" } },
-                    "required" :
+                    "required" : 
                     [ "component-uuid" ],
                     "additionalProperties" : false } },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "uuid" ],
               "additionalProperties" : false } } },
-        "required" :
+        "required" : 
         [ "assessment-platforms" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:finding-target" :
+      "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" :
+        "properties" : 
+        { "type" : 
           { "title" : "Finding Target Type",
             "description" : "Identifies the type of the target.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$",
-            "enum" :
+            "enum" : 
             [ "statement-id",
               "objective-id" ] },
-          "target-id" :
+          "target-id" : 
           { "title" : "Finding Target Identifier Reference",
             "description" : "Identifies the specific target qualified by the type.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "title" :
+          "title" : 
           { "title" : "Objective Status Title",
             "description" : "The title for this objective status.",
             "type" : "string" },
-          "description" :
+          "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" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "status" :
+          "status" : 
           { "title" : "Objective Status",
-            "description" : "A brief indication as to whether the objective is satisfied or not within a given system.",
-            "type" : "string",
-            "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$",
-            "enum" :
-            [ "satisfied",
-              "not-satisfied" ] },
-          "" :
-          { "anyOf" :
-            [
+            "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.",
+                "type" : "string",
+                "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$",
+                "enum" : 
+                [ "satisfied",
+                  "not-satisfied" ] },
+              "reason" : 
               { "title" : "Objective Status Reason",
                 "description" : "The reason the objective was given it's status.",
-                "type" : "string" },
-
-              { "type" : "array",
-                "minItems" : 1,
-                "items" :
-                { "title" : "Objective Status Reason",
-                  "description" : "The reason the objective was given it's status.",
-                  "type" : "string" } } ] },
-          "implementation-status" :
+                "type" : "string",
+                "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
+              "remarks" : 
+              { "$ref" : "#field_oscal-metadata_remarks" } },
+            "required" : 
+            [ "state" ],
+            "additionalProperties" : false },
+          "implementation-status" : 
           { "$ref" : "#assembly_oscal-implementation-common_implementation-status" },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "type",
           "target-id",
           "status" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:observation" :
+      "oscal-complete-oscal-assessment-common:observation" : 
       { "title" : "Observation",
         "description" : "Describes an individual observation.",
         "$id" : "#assembly_oscal-assessment-common_observation",
         "type" : "object",
-        "properties" :
-        { "uuid" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Observation Universally Unique Identifier",
             "description" : "Uniquely identifies this observation. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. Once assigned, a UUID should be consistently used for a given observation across revisions.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "title" :
+          "title" : 
           { "title" : "Observation Title",
             "description" : "The title for this observation.",
             "type" : "string" },
-          "description" :
+          "description" : 
           { "title" : "Observation Description",
             "description" : "A human-readable description of this assessment observation.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "methods" :
+          "methods" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Observation Method",
               "description" : "Identifies how the observation was made.",
               "type" : "string",
               "pattern" : "^\\S(.*\\S)?$" } },
-          "types" :
+          "types" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Observation Type",
               "description" : "Identifies the nature of the observation. More than one may be used to further qualify and enable filtering.",
               "type" : "string",
               "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" } },
-          "origins" :
+          "origins" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_origin" } },
-          "subjects" :
+          "subjects" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_subject-reference" } },
-          "relevant-evidence" :
+          "relevant-evidence" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Relevant Evidence",
               "description" : "Links this observation to relevant evidence.",
               "type" : "object",
-              "properties" :
-              { "href" :
+              "properties" : 
+              { "href" : 
                 { "title" : "Relevant Evidence Reference",
                   "description" : ">A resolvable URL reference to relevant evidence.",
                   "type" : "string",
                   "format" : "uri-reference" },
-                "description" :
+                "description" : 
                 { "title" : "Relevant Evidence Description",
                   "description" : "A human-readable description of this evidence.",
                   "type" : "string" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "description" ],
               "additionalProperties" : false } },
-          "collected" :
+          "collected" : 
           { "title" : "collected field",
             "description" : "Date/time stamp identifying when the finding information was collected.",
             "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-9]{2}:[0-9]{2})$" },
-          "expires" :
+          "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.",
             "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-9]{2}:[0-9]{2})$" },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "description",
           "methods",
           "collected" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:origin" :
+      "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" :
+        "properties" : 
+        { "actors" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_origin-actor" } },
-          "related-tasks" :
+          "related-tasks" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_related-task" } } },
-        "required" :
+        "required" : 
         [ "actors" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:origin-actor" :
+      "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" :
+        "properties" : 
+        { "type" : 
           { "title" : "Actor Type",
             "description" : "The kind of actor.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$",
-            "enum" :
+            "enum" : 
             [ "tool",
               "assessment-platform",
               "party" ] },
-          "actor-uuid" :
+          "actor-uuid" : 
           { "title" : "Actor Universally Unique Identifier Reference",
             "description" : "A pointer to the tool or person based on the associated type.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "role-id" :
+          "role-id" : 
           { "title" : "Actor Role",
             "description" : "For a party, this can optionally be used to specify the role the actor was performing.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } } },
-        "required" :
+        "required" : 
         [ "type",
           "actor-uuid" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:related-task" :
+      "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" :
+        "properties" : 
+        { "task-uuid" : 
           { "title" : "Task Universally Unique Identifier Reference",
             "description" : "References a unique task by UUID.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "responsible-parties" :
+          "responsible-parties" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-          "subjects" :
+          "subjects" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
-          "identified-subject" :
+          "identified-subject" : 
           { "title" : "Identified Subject",
             "description" : "Used to detail assessment subjects that were identfied by this task.",
             "type" : "object",
-            "properties" :
-            { "subject-placeholder-uuid" :
+            "properties" : 
+            { "subject-placeholder-uuid" : 
               { "title" : "Assessment Subject Placeholder Universally Unique Identifier Reference",
                 "description" : "References a unique assessment subject placeholder defined by this task.",
                 "type" : "string",
                 "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-              "subjects" :
+              "subjects" : 
               { "type" : "array",
                 "minItems" : 1,
-                "items" :
+                "items" : 
                 { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } } },
-            "required" :
+            "required" : 
             [ "subject-placeholder-uuid",
               "subjects" ],
             "additionalProperties" : false },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "task-uuid" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:threat-id" :
+      "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" :
+        "properties" : 
+        { "system" : 
           { "title" : "Threat Type Identification System",
             "description" : "Specifies the source of the threat information.",
             "type" : "string",
             "format" : "uri" },
-          "href" :
+          "href" : 
           { "title" : "Threat Information Resource Reference",
             "description" : "An optional location for the threat data, from which this ID originates.",
             "type" : "string",
             "format" : "uri-reference" },
-          "id" :
+          "id" : 
           { "type" : "string" } },
-        "required" :
+        "required" : 
         [ "id",
           "system" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:risk" :
+      "oscal-complete-oscal-assessment-common:risk" : 
       { "title" : "Identified Risk",
         "description" : "An identified risk.",
         "$id" : "#assembly_oscal-assessment-common_risk",
         "type" : "object",
-        "properties" :
-        { "uuid" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Risk Universally Unique Identifier",
             "description" : "Uniquely identifies this risk. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. Once assigned, a UUID should be consistently used for a given risk across revisions.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "title" :
+          "title" : 
           { "title" : "Risk Title",
             "description" : "The title for this risk.",
             "type" : "string" },
-          "description" :
+          "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" :
+          "statement" : 
           { "title" : "Risk Statement",
             "description" : "An summary of impact for how the risk affects the system.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "status" :
+          "status" : 
           { "title" : "Status",
             "description" : "Describes the status of the associated risk.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "origins" :
+          "origins" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_origin" } },
-          "threat-ids" :
+          "threat-ids" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-assessment-common_threat-id" } },
-          "characterizations" :
+          "characterizations" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_characterization" } },
-          "mitigating-factors" :
+          "mitigating-factors" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "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" :
+              "properties" : 
+              { "uuid" : 
                 { "title" : "Mitigating Factor Universally Unique Identifier",
                   "description" : "Uniquely identifies this mitigating factor. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. Once assigned, a UUID should be consistently used for a given mitigating factor across revisions.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "implementation-uuid" :
+                "implementation-uuid" : 
                 { "title" : "Implementation UUID",
                   "description" : "Points to an implementation statement in the SSP.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "description" :
+                "description" : 
                 { "title" : "Mitigating Factor Description",
                   "description" : "A human-readable description of this mitigating factor.",
                   "type" : "string" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "subjects" :
+                "subjects" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-assessment-common_subject-reference" } } },
-              "required" :
+              "required" : 
               [ "uuid",
                 "description" ],
               "additionalProperties" : false } },
-          "deadline" :
+          "deadline" : 
           { "title" : "Risk Resolution Deadline",
             "description" : "The date/time by which the risk must be resolved.",
             "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-9]{2}:[0-9]{2})$" },
-          "remediations" :
+          "remediations" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_response" } },
-          "risk-log" :
+          "risk-log" : 
           { "title" : "Risk Log",
             "description" : "A log of all risk-related tasks taken.",
             "type" : "object",
-            "properties" :
-            { "entries" :
+            "properties" : 
+            { "entries" : 
               { "type" : "array",
                 "minItems" : 1,
-                "items" :
+                "items" : 
                 { "title" : "Risk Log Entry",
                   "description" : "Identifies an individual risk response that occurred as part of managing an identified risk.",
                   "type" : "object",
-                  "properties" :
-                  { "uuid" :
+                  "properties" : 
+                  { "uuid" : 
                     { "title" : "Risk Log Entry Universally Unique Identifier",
                       "description" : "Uniquely identifies a risk log entry. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. A UUID should be consistently used for this schedule across revisions of the document.",
                       "type" : "string",
                       "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                    "title" :
+                    "title" : 
                     { "title" : "Title",
                       "description" : "The title for this risk log entry.",
                       "type" : "string" },
-                    "description" :
+                    "description" : 
                     { "title" : "Risk Task Description",
                       "description" : "A human-readable description of what was done regarding the risk.",
                       "type" : "string" },
-                    "start" :
+                    "start" : 
                     { "title" : "Start",
                       "description" : "Identifies the start date and time of the event.",
                       "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-9]{2}:[0-9]{2})$" },
-                    "end" :
+                    "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.",
                       "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-9]{2}:[0-9]{2})$" },
-                    "props" :
+                    "props" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "$ref" : "#assembly_oscal-metadata_property" } },
-                    "links" :
+                    "links" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "$ref" : "#assembly_oscal-metadata_link" } },
-                    "logged-by" :
+                    "logged-by" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "$ref" : "#assembly_oscal-assessment-common_logged-by" } },
-                    "status-change" :
+                    "status-change" : 
                     { "$ref" : "#field_oscal-assessment-common_risk-status" },
-                    "related-responses" :
+                    "related-responses" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "title" : "Risk Response Reference",
                         "description" : "Identifies an individual risk response that this log entry is for.",
                         "type" : "object",
-                        "properties" :
-                        { "response-uuid" :
+                        "properties" : 
+                        { "response-uuid" : 
                           { "title" : "Response Universally Unique Identifier Reference",
                             "description" : "References a unique risk response by UUID.",
                             "type" : "string",
                             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                          "props" :
+                          "props" : 
                           { "type" : "array",
                             "minItems" : 1,
-                            "items" :
+                            "items" : 
                             { "$ref" : "#assembly_oscal-metadata_property" } },
-                          "links" :
+                          "links" : 
                           { "type" : "array",
                             "minItems" : 1,
-                            "items" :
+                            "items" : 
                             { "$ref" : "#assembly_oscal-metadata_link" } },
-                          "related-tasks" :
+                          "related-tasks" : 
                           { "type" : "array",
                             "minItems" : 1,
-                            "items" :
+                            "items" : 
                             { "$ref" : "#assembly_oscal-assessment-common_related-task" } },
-                          "remarks" :
+                          "remarks" : 
                           { "$ref" : "#field_oscal-metadata_remarks" } },
-                        "required" :
+                        "required" : 
                         [ "response-uuid" ],
                         "additionalProperties" : false } },
-                    "remarks" :
+                    "remarks" : 
                     { "$ref" : "#field_oscal-metadata_remarks" } },
-                  "required" :
+                  "required" : 
                   [ "uuid",
                     "start" ],
                   "additionalProperties" : false } } },
-            "required" :
+            "required" : 
             [ "entries" ],
             "additionalProperties" : false },
-          "related-observations" :
+          "related-observations" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "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" :
+              "properties" : 
+              { "observation-uuid" : 
                 { "title" : "Observation Universally Unique Identifier Reference",
                   "description" : "References an observation defined in the list of observations.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" } },
-              "required" :
+              "required" : 
               [ "observation-uuid" ],
               "additionalProperties" : false } } },
-        "required" :
+        "required" : 
         [ "uuid",
           "title",
           "description",
           "statement",
           "status" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:logged-by" :
+      "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" :
+        "properties" : 
+        { "party-uuid" : 
           { "title" : "Party UUID Reference",
             "description" : "A pointer to the party who is making the log entry.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "role-id" :
+          "role-id" : 
           { "title" : "Actor Role",
             "description" : "A point to the role-id of the role in which the party is making the log entry.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" } },
-        "required" :
+        "required" : 
         [ "party-uuid" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:risk-status" :
+      "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",
         "type" : "string",
         "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-      "oscal-complete-oscal-assessment-common:characterization" :
+      "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" :
+        "properties" : 
+        { "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "origin" :
+          "origin" : 
           { "$ref" : "#assembly_oscal-assessment-common_origin" },
-          "facets" :
+          "facets" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Facet",
               "description" : "An individual characteristic that is part of a larger set produced by the same actor.",
               "type" : "object",
-              "properties" :
-              { "name" :
+              "properties" : 
+              { "name" : 
                 { "title" : "Facet Name",
                   "description" : "The name of the risk metric within the specified system.",
                   "type" : "string",
                   "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-                "system" :
+                "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.",
                   "type" : "string",
                   "format" : "uri" },
-                "value" :
+                "value" : 
                 { "title" : "Facet Value",
                   "description" : "Indicates the value of the facet.",
                   "type" : "string",
                   "pattern" : "^\\S(.*\\S)?$" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "name",
                 "system",
                 "value" ],
               "additionalProperties" : false } } },
-        "required" :
+        "required" : 
         [ "origin",
           "facets" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:response" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Remediation Universally Unique Identifier",
             "description" : "Uniquely identifies this remediation. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. Once assigned, a UUID should be consistently used for a given remediation across revisions.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "lifecycle" :
+          "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.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "title" :
+          "title" : 
           { "title" : "Response Title",
             "description" : "The title for this response activity.",
             "type" : "string" },
-          "description" :
+          "description" : 
           { "title" : "Response Description",
             "description" : "A human-readable description of this response plan.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "origins" :
+          "origins" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_origin" } },
-          "required-assets" :
+          "required-assets" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Required Asset",
               "description" : "Identifies an asset required to achieve remediation.",
               "type" : "object",
-              "properties" :
-              { "uuid" :
+              "properties" : 
+              { "uuid" : 
                 { "title" : "Required Universally Unique Identifier",
                   "description" : "Uniquely identifies this required asset. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. Once assigned, a UUID should be consistently used for a given required asset across revisions.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "subjects" :
+                "subjects" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-assessment-common_subject-reference" } },
-                "title" :
+                "title" : 
                 { "title" : "Title for Required Asset",
                   "description" : "The title for this required asset.",
                   "type" : "string" },
-                "description" :
+                "description" : 
                 { "title" : "Description of Required Asset",
                   "description" : "A human-readable description of this required asset.",
                   "type" : "string" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "uuid",
                 "description" ],
               "additionalProperties" : false } },
-          "tasks" :
+          "tasks" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_task" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "lifecycle",
           "title",
           "description" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:assessment-part" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Part Identifier",
             "description" : "A unique identifier for a specific part instance. This identifier's uniqueness is document scoped and is intended to be consistent for the same part across minor revisions of the document.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "name" :
+          "name" : 
           { "title" : "Part Name",
             "description" : "A textual label that uniquely identifies the part's semantic type.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "ns" :
+          "ns" : 
           { "title" : "Part Namespace",
             "description" : "A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.",
             "type" : "string",
             "format" : "uri" },
-          "class" :
+          "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.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "title" :
+          "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" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "prose" :
+          "prose" : 
           { "title" : "Part Text",
             "description" : "Permits multiple paragraphs, lists, tables etc.",
             "type" : "string" },
-          "parts" :
+          "parts" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_assessment-part" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } } },
-        "required" :
+        "required" : 
         [ "name" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-ar:assessment-results" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Assessment Results Universally Unique Identifier",
             "description" : "Uniquely identifies this assessment results file. This UUID must be changed each time the content of the results changes.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "metadata" :
+          "metadata" : 
           { "$ref" : "#assembly_oscal-metadata_metadata" },
-          "import-ap" :
+          "import-ap" : 
           { "$ref" : "#assembly_oscal-ar_import-ap" },
-          "local-definitions" :
+          "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" :
+            "properties" : 
+            { "objectives-and-methods" : 
               { "type" : "array",
                 "minItems" : 1,
-                "items" :
+                "items" : 
                 { "$ref" : "#assembly_oscal-assessment-common_local-objective" } },
-              "activities" :
+              "activities" : 
               { "type" : "array",
                 "minItems" : 1,
-                "items" :
+                "items" : 
                 { "$ref" : "#assembly_oscal-assessment-common_activity" } },
-              "remarks" :
+              "remarks" : 
               { "$ref" : "#field_oscal-metadata_remarks" } },
             "additionalProperties" : false },
-          "results" :
+          "results" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-ar_result" } },
-          "back-matter" :
+          "back-matter" : 
           { "$ref" : "#assembly_oscal-metadata_back-matter" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "metadata",
           "import-ap",
           "results" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-ar:result" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Results Universally Unique Identifier",
             "description" : "Uniquely identifies this set of results. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. Once assigned, a UUID should be consistently used for a given set of results across revisions.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "title" :
+          "title" : 
           { "title" : "Results Title",
             "description" : "The title for this set of results.",
             "type" : "string" },
-          "description" :
+          "description" : 
           { "title" : "Results Description",
             "description" : "A human-readable description of this set of test results.",
             "type" : "string" },
-          "start" :
+          "start" : 
           { "title" : "start field",
             "description" : "Date/time stamp identifying the start of the evidence collection reflected in these results.",
             "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-9]{2}:[0-9]{2})$" },
-          "end" :
+          "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.",
             "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-9]{2}:[0-9]{2})$" },
-          "prop" :
+          "prop" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "local-definitions" :
+          "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" :
+            "properties" : 
+            { "components" : 
               { "type" : "array",
                 "minItems" : 1,
-                "items" :
+                "items" : 
                 { "$ref" : "#assembly_oscal-implementation-common_system-component" } },
-              "inventory-items" :
+              "inventory-items" : 
               { "type" : "array",
                 "minItems" : 1,
-                "items" :
+                "items" : 
                 { "$ref" : "#assembly_oscal-implementation-common_inventory-item" } },
-              "users" :
+              "users" : 
               { "type" : "array",
                 "minItems" : 1,
-                "items" :
+                "items" : 
                 { "$ref" : "#assembly_oscal-implementation-common_system-user" } },
-              "assessment-assets" :
+              "assessment-assets" : 
               { "$ref" : "#assembly_oscal-assessment-common_assessment-assets" },
-              "tasks" :
+              "tasks" : 
               { "type" : "array",
                 "minItems" : 1,
-                "items" :
+                "items" : 
                 { "$ref" : "#assembly_oscal-assessment-common_task" } } },
             "additionalProperties" : false },
-          "reviewed-controls" :
+          "reviewed-controls" : 
           { "$ref" : "#assembly_oscal-assessment-common_reviewed-controls" },
-          "attestations" :
+          "attestations" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Attestation Statements",
               "description" : "A set of textual statements, typically written by the assessor.",
               "type" : "object",
-              "properties" :
-              { "responsible-parties" :
+              "properties" : 
+              { "responsible-parties" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-                "parts" :
+                "parts" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-assessment-common_assessment-part" } } },
-              "required" :
+              "required" : 
               [ "parts" ],
               "additionalProperties" : false } },
-          "assessment-log" :
+          "assessment-log" : 
           { "title" : "Assessment Log",
             "description" : "A log of all assessment-related actions taken.",
             "type" : "object",
-            "properties" :
-            { "entries" :
+            "properties" : 
+            { "entries" : 
               { "type" : "array",
                 "minItems" : 1,
-                "items" :
+                "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" :
+                  "properties" : 
+                  { "uuid" : 
                     { "title" : "Assessment Log Entry Universally Unique Identifier",
                       "description" : "Uniquely identifies an assessment event. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. A UUID should be consistently used for this schedule across revisions of the document.",
                       "type" : "string",
                       "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                    "title" :
+                    "title" : 
                     { "title" : "Action Title",
                       "description" : "The title for this event.",
                       "type" : "string" },
-                    "description" :
+                    "description" : 
                     { "title" : "Action Description",
                       "description" : "A human-readable description of this event.",
                       "type" : "string" },
-                    "start" :
+                    "start" : 
                     { "title" : "Start",
                       "description" : "Identifies the start date and time of an event.",
                       "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-9]{2}:[0-9]{2})$" },
-                    "end" :
+                    "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.",
                       "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-9]{2}:[0-9]{2})$" },
-                    "props" :
+                    "props" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "$ref" : "#assembly_oscal-metadata_property" } },
-                    "links" :
+                    "links" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "$ref" : "#assembly_oscal-metadata_link" } },
-                    "logged-by" :
+                    "logged-by" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "$ref" : "#assembly_oscal-assessment-common_logged-by" } },
-                    "related-tasks" :
+                    "related-tasks" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "$ref" : "#assembly_oscal-assessment-common_related-task" } },
-                    "remarks" :
+                    "remarks" : 
                     { "$ref" : "#field_oscal-metadata_remarks" } },
-                  "required" :
+                  "required" : 
                   [ "uuid",
                     "start" ],
                   "additionalProperties" : false } } },
-            "required" :
+            "required" : 
             [ "entries" ],
             "additionalProperties" : false },
-          "observations" :
+          "observations" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_observation" } },
-          "risks" :
+          "risks" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_risk" } },
-          "findings" :
+          "findings" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-ar_finding" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "title",
           "description",
           "start",
           "reviewed-controls" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-ar:finding" :
+      "oscal-complete-oscal-ar:finding" : 
       { "title" : "Finding",
         "description" : "Describes an individual finding.",
         "$id" : "#assembly_oscal-ar_finding",
         "type" : "object",
-        "properties" :
-        { "uuid" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Finding Universally Unique Identifier",
             "description" : "Uniquely identifies this finding. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. Once assigned, a UUID should be consistently used for a given finding across revisions.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "title" :
+          "title" : 
           { "title" : "Finding Title",
             "description" : "The title for this finding.",
             "type" : "string" },
-          "description" :
+          "description" : 
           { "title" : "Finding Description",
             "description" : "A human-readable description of this finding.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "origins" :
+          "origins" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_origin" } },
-          "target" :
+          "target" : 
           { "$ref" : "#assembly_oscal-assessment-common_finding-target" },
-          "implementation-statement-uuid" :
+          "implementation-statement-uuid" : 
           { "title" : "Implementation Statement UUID",
             "description" : "Identifies the implementation statement in the SSP to which this finding is related.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "related-observations" :
+          "related-observations" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "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" :
+              "properties" : 
+              { "observation-uuid" : 
                 { "title" : "Observation Universally Unique Identifier Reference",
                   "description" : "References an observation defined in the list of observations.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" } },
-              "required" :
+              "required" : 
               [ "observation-uuid" ],
               "additionalProperties" : false } },
-          "related-risks" :
+          "related-risks" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "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" :
+              "properties" : 
+              { "risk-uuid" : 
                 { "title" : "Risk Universally Unique Identifier Reference",
                   "description" : "References an risk defined in the list of risks.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" } },
-              "required" :
+              "required" : 
               [ "risk-uuid" ],
               "additionalProperties" : false } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "title",
           "description",
           "target" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-ar:import-ap" :
+      "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" :
+        "properties" : 
+        { "href" : 
           { "title" : "Assessment Plan Reference",
             "description" : ">A resolvable URL reference to the assessment plan governing the assessment activities.",
             "type" : "string",
             "format" : "uri-reference" },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "href" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-poam:plan-of-action-and-milestones" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "POA&M Universally Unique Identifier",
             "description" : "Uniquely identifies this POA&M. This UUID must be changed each time the content of the POA&M changes.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "metadata" :
+          "metadata" : 
           { "$ref" : "#assembly_oscal-metadata_metadata" },
-          "import-ssp" :
+          "import-ssp" : 
           { "$ref" : "#assembly_oscal-assessment-common_import-ssp" },
-          "system-id" :
+          "system-id" : 
           { "$ref" : "#field_oscal-implementation-common_system-id" },
-          "local-definitions" :
+          "local-definitions" : 
           { "$ref" : "#assembly_oscal-poam_local-definitions" },
-          "observations" :
+          "observations" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_observation" } },
-          "risks" :
+          "risks" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_risk" } },
-          "poam-items" :
+          "poam-items" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-poam_poam-item" } },
-          "back-matter" :
+          "back-matter" : 
           { "$ref" : "#assembly_oscal-metadata_back-matter" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "metadata",
           "poam-items" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-poam:local-definitions" :
+      "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" :
+        "properties" : 
+        { "components" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-implementation-common_system-component" } },
-          "inventory-items" :
+          "inventory-items" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-implementation-common_inventory-item" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
         "additionalProperties" : false },
-      "oscal-complete-oscal-poam:poam-item" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "POA&M Item Universally Unique Identifier",
             "description" : "Uniquely identifies the POA&M entry. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. A UUID should be consistently used for a given POA&M item across revisions of the document.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "title" :
+          "title" : 
           { "title" : "POA&M Item Title",
             "description" : "The title or name for this POA&M item .",
             "type" : "string" },
-          "description" :
+          "description" : 
           { "title" : "POA&M Item Description",
             "description" : "A human-readable description of POA&M item.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "origins" :
+          "origins" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Origin",
               "description" : "Identifies the source of the finding, such as a tool or person.",
               "type" : "object",
-              "properties" :
-              { "actors" :
+              "properties" : 
+              { "actors" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-assessment-common_origin-actor" } } },
-              "required" :
+              "required" : 
               [ "actors" ],
               "additionalProperties" : false } },
-          "related-observations" :
+          "related-observations" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "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" :
+              "properties" : 
+              { "observation-uuid" : 
                 { "title" : "Observation Universally Unique Identifier Reference",
                   "description" : "References an observation defined in the list of observations.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" } },
-              "required" :
+              "required" : 
               [ "observation-uuid" ],
               "additionalProperties" : false } },
-          "related-risks" :
+          "related-risks" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "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" :
+              "properties" : 
+              { "risk-uuid" : 
                 { "title" : "Risk Universally Unique Identifier Reference",
                   "description" : "References an risk defined in the list of risks.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" } },
-              "required" :
+              "required" : 
               [ "risk-uuid" ],
               "additionalProperties" : false } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "title",
           "description" ],
         "additionalProperties" : false } },
-    "oneOf" :
-    [
-      { "properties" :
-        { "catalog" :
+    "oneOf" : 
+    [ 
+      { "properties" : 
+        { "catalog" : 
           { "$ref" : "#assembly_oscal-catalog_catalog" } },
-        "required" :
+        "required" : 
         [ "catalog" ],
         "additionalProperties" : false,
         "maxProperties" : 1 },
-
-      { "properties" :
-        { "profile" :
+      
+      { "properties" : 
+        { "profile" : 
           { "$ref" : "#assembly_oscal-profile_profile" } },
-        "required" :
+        "required" : 
         [ "profile" ],
         "additionalProperties" : false,
         "maxProperties" : 1 },
-
-      { "properties" :
-        { "component-definition" :
+      
+      { "properties" : 
+        { "component-definition" : 
           { "$ref" : "#assembly_oscal-component-definition_component-definition" } },
-        "required" :
+        "required" : 
         [ "component-definition" ],
         "additionalProperties" : false,
         "maxProperties" : 1 },
-
-      { "properties" :
-        { "system-security-plan" :
+      
+      { "properties" : 
+        { "system-security-plan" : 
           { "$ref" : "#assembly_oscal-ssp_system-security-plan" } },
-        "required" :
+        "required" : 
         [ "system-security-plan" ],
         "additionalProperties" : false,
         "maxProperties" : 1 },
-
-      { "properties" :
-        { "assessment-plan" :
+      
+      { "properties" : 
+        { "assessment-plan" : 
           { "$ref" : "#assembly_oscal-ap_assessment-plan" } },
-        "required" :
+        "required" : 
         [ "assessment-plan" ],
         "additionalProperties" : false,
         "maxProperties" : 1 },
-
-      { "properties" :
-        { "assessment-results" :
+      
+      { "properties" : 
+        { "assessment-results" : 
           { "$ref" : "#assembly_oscal-ar_assessment-results" } },
-        "required" :
+        "required" : 
         [ "assessment-results" ],
         "additionalProperties" : false,
         "maxProperties" : 1 },
-
-      { "properties" :
-        { "plan-of-action-and-milestones" :
+      
+      { "properties" : 
+        { "plan-of-action-and-milestones" : 
           { "$ref" : "#assembly_oscal-poam_plan-of-action-and-milestones" } },
-        "required" :
+        "required" : 
         [ "plan-of-action-and-milestones" ],
         "additionalProperties" : false,
-        "maxProperties" : 1 } ] }
+        "maxProperties" : 1 } ] }
\ No newline at end of file
diff --git a/json/schema/oscal_poam_schema.json b/json/schema/oscal_poam_schema.json
index 36fbb2debb..c49faaa6ec 100644
--- a/json/schema/oscal_poam_schema.json
+++ b/json/schema/oscal_poam_schema.json
@@ -3,2839 +3,2841 @@
     "$id" : "http://csrc.nist.gov/ns/oscal/1.0.0/oscal-poam-schema.json",
     "$comment" : "OSCAL Plan of Action and Milestones (POA&M) Model: JSON Schema",
     "type" : "object",
-    "definitions" :
-    { "oscal-poam-oscal-poam:plan-of-action-and-milestones" :
+    "definitions" : 
+    { "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "POA&M Universally Unique Identifier",
             "description" : "Uniquely identifies this POA&M. This UUID must be changed each time the content of the POA&M changes.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "metadata" :
+          "metadata" : 
           { "$ref" : "#assembly_oscal-metadata_metadata" },
-          "import-ssp" :
+          "import-ssp" : 
           { "$ref" : "#assembly_oscal-assessment-common_import-ssp" },
-          "system-id" :
+          "system-id" : 
           { "$ref" : "#field_oscal-implementation-common_system-id" },
-          "local-definitions" :
+          "local-definitions" : 
           { "$ref" : "#assembly_oscal-poam_local-definitions" },
-          "observations" :
+          "observations" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_observation" } },
-          "risks" :
+          "risks" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_risk" } },
-          "poam-items" :
+          "poam-items" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-poam_poam-item" } },
-          "back-matter" :
+          "back-matter" : 
           { "$ref" : "#assembly_oscal-metadata_back-matter" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "metadata",
           "poam-items" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-poam:local-definitions" :
+      "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" :
+        "properties" : 
+        { "components" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-implementation-common_system-component" } },
-          "inventory-items" :
+          "inventory-items" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-implementation-common_inventory-item" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
         "additionalProperties" : false },
-      "oscal-poam-oscal-poam:poam-item" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "POA&M Item Universally Unique Identifier",
             "description" : "Uniquely identifies the POA&M entry. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. A UUID should be consistently used for a given POA&M item across revisions of the document.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "title" :
+          "title" : 
           { "title" : "POA&M Item Title",
             "description" : "The title or name for this POA&M item .",
             "type" : "string" },
-          "description" :
+          "description" : 
           { "title" : "POA&M Item Description",
             "description" : "A human-readable description of POA&M item.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "origins" :
+          "origins" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Origin",
               "description" : "Identifies the source of the finding, such as a tool or person.",
               "type" : "object",
-              "properties" :
-              { "actors" :
+              "properties" : 
+              { "actors" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-assessment-common_origin-actor" } } },
-              "required" :
+              "required" : 
               [ "actors" ],
               "additionalProperties" : false } },
-          "related-observations" :
+          "related-observations" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "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" :
+              "properties" : 
+              { "observation-uuid" : 
                 { "title" : "Observation Universally Unique Identifier Reference",
                   "description" : "References an observation defined in the list of observations.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" } },
-              "required" :
+              "required" : 
               [ "observation-uuid" ],
               "additionalProperties" : false } },
-          "related-risks" :
+          "related-risks" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "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" :
+              "properties" : 
+              { "risk-uuid" : 
                 { "title" : "Risk Universally Unique Identifier Reference",
                   "description" : "References an risk defined in the list of risks.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" } },
-              "required" :
+              "required" : 
               [ "risk-uuid" ],
               "additionalProperties" : false } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "title",
           "description" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-metadata:metadata" :
+      "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" :
+        "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" :
+          "published" : 
           { "$ref" : "#field_oscal-metadata_published" },
-          "last-modified" :
+          "last-modified" : 
           { "$ref" : "#field_oscal-metadata_last-modified" },
-          "version" :
+          "version" : 
           { "$ref" : "#field_oscal-metadata_version" },
-          "oscal-version" :
+          "oscal-version" : 
           { "$ref" : "#field_oscal-metadata_oscal-version" },
-          "revisions" :
+          "revisions" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_revision" } },
-          "document-ids" :
+          "document-ids" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-metadata_document-id" } },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "roles" :
+          "roles" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_role" } },
-          "locations" :
+          "locations" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_location" } },
-          "parties" :
+          "parties" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_party" } },
-          "responsible-parties" :
+          "responsible-parties" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "title",
           "last-modified",
           "version",
           "oscal-version" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-metadata:revision" :
+      "oscal-poam-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" :
+        "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" :
+          "published" : 
           { "$ref" : "#field_oscal-metadata_published" },
-          "last-modified" :
+          "last-modified" : 
           { "$ref" : "#field_oscal-metadata_last-modified" },
-          "version" :
+          "version" : 
           { "$ref" : "#field_oscal-metadata_version" },
-          "oscal-version" :
+          "oscal-version" : 
           { "$ref" : "#field_oscal-metadata_oscal-version" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
         "additionalProperties" : false },
-      "oscal-poam-oscal-metadata:location" :
+      "oscal-poam-oscal-metadata:location" : 
       { "title" : "Location",
         "description" : "A location, with associated metadata that can be referenced.",
         "$id" : "#assembly_oscal-metadata_location",
         "type" : "object",
-        "properties" :
-        { "uuid" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Location Universally Unique Identifier",
             "description" : "A unique identifier that can be used to reference this defined location elsewhere in an OSCAL document. A UUID should be consistently used for a given location across revisions of the document.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "title" :
+          "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" :
+          "address" : 
           { "$ref" : "#assembly_oscal-metadata_address" },
-          "email-addresses" :
+          "email-addresses" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-metadata_email-address" } },
-          "telephone-numbers" :
+          "telephone-numbers" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-metadata_telephone-number" } },
-          "urls" :
+          "urls" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Location URL",
               "description" : "The uniform resource locator (URL) for a web site or Internet presence associated with the location.",
               "type" : "string",
               "format" : "uri" } },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "address" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-metadata:location-uuid" :
+      "oscal-poam-oscal-metadata:location-uuid" : 
       { "title" : "Location Reference",
         "description" : "References a location defined in metadata.",
         "$id" : "#field_oscal-metadata_location-uuid",
         "type" : "string",
         "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-      "oscal-poam-oscal-metadata:party" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Party Universally Unique Identifier",
             "description" : "A unique identifier that can be used to reference this defined location elsewhere in an OSCAL document. A UUID should be consistently used for a given party across revisions of the document.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "type" :
+          "type" : 
           { "title" : "Party Type",
             "description" : "A category describing the kind of party the object describes.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$",
-            "enum" :
+            "enum" : 
             [ "person",
               "organization" ] },
-          "name" :
+          "name" : 
           { "title" : "Party Name",
             "description" : "The full name of the party. This is typically the legal name associated with the party.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "short-name" :
+          "short-name" : 
           { "title" : "Party Short Name",
             "description" : "A short common name, abbreviation, or acronym for the party.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "external-ids" :
+          "external-ids" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "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" :
+              "properties" : 
+              { "scheme" : 
                 { "title" : "External Identifier Schema",
                   "description" : "Indicates the type of external identifier.",
                   "type" : "string",
                   "format" : "uri" },
-                "id" :
+                "id" : 
                 { "type" : "string" } },
-              "required" :
+              "required" : 
               [ "id",
                 "scheme" ],
               "additionalProperties" : false } },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "email-addresses" :
+          "email-addresses" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-metadata_email-address" } },
-          "telephone-numbers" :
+          "telephone-numbers" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-metadata_telephone-number" } },
-          "addresses" :
+          "addresses" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_address" } },
-          "location-uuids" :
+          "location-uuids" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-metadata_location-uuid" } },
-          "member-of-organizations" :
+          "member-of-organizations" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Organizational Affiliation",
               "description" : "Identifies that the party object is a member of the organization associated with the provided UUID.",
               "type" : "string",
               "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "type" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-metadata:party-uuid" :
+      "oscal-poam-oscal-metadata:party-uuid" : 
       { "title" : "Party Reference",
         "description" : "References a party defined in metadata.",
         "$id" : "#field_oscal-metadata_party-uuid",
         "type" : "string",
         "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-      "oscal-poam-oscal-metadata:role" :
+      "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" :
+        "properties" : 
+        { "id" : 
           { "title" : "Role Identifier",
             "description" : "A unique identifier for a specific role instance. This identifier's uniqueness is document scoped and is intended to be consistent for the same role across minor revisions of the document.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "title" :
+          "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" :
+          "short-name" : 
           { "title" : "Role Short Name",
             "description" : "A short common name, abbreviation, or acronym for the role.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "description" :
+          "description" : 
           { "title" : "Role Description",
             "description" : "A summary of the role's purpose and associated responsibilities.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "id",
           "title" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-metadata:role-id" :
+      "oscal-poam-oscal-metadata:role-id" : 
       { "title" : "Role Identifier Reference",
         "description" : "A reference to the roles served by the user.",
         "$id" : "#field_oscal-metadata_role-id",
         "type" : "string",
         "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-      "oscal-poam-oscal-metadata:back-matter" :
+      "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" :
+        "properties" : 
+        { "resources" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "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" :
+              "properties" : 
+              { "uuid" : 
                 { "title" : "Resource Universally Unique Identifier",
                   "description" : "A globally unique identifier that can be used to reference this defined resource elsewhere in an OSCAL document. A UUID should be consistently used for a given resource across revisions of the document.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "title" :
+                "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" :
+                "description" : 
                 { "title" : "Resource Description",
                   "description" : "A short summary of the resource used to indicate the purpose of the resource.",
                   "type" : "string" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "document-ids" :
+                "document-ids" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#field_oscal-metadata_document-id" } },
-                "citation" :
+                "citation" : 
                 { "title" : "Citation",
                   "description" : "A citation consisting of end note text and optional structured bibliographic data.",
                   "type" : "object",
-                  "properties" :
-                  { "text" :
+                  "properties" : 
+                  { "text" : 
                     { "title" : "Citation Text",
                       "description" : "A line of citation text.",
                       "type" : "string" },
-                    "props" :
+                    "props" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "$ref" : "#assembly_oscal-metadata_property" } },
-                    "links" :
+                    "links" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "$ref" : "#assembly_oscal-metadata_link" } } },
-                  "required" :
+                  "required" : 
                   [ "text" ],
                   "additionalProperties" : false },
-                "rlinks" :
+                "rlinks" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "title" : "Resource link",
                     "description" : "A pointer to an external resource with an optional hash for verification and change detection.",
                     "type" : "object",
-                    "properties" :
-                    { "href" :
+                    "properties" : 
+                    { "href" : 
                       { "title" : "Hypertext Reference",
                         "description" : "A resolvable URI reference to a resource.",
                         "type" : "string",
                         "format" : "uri-reference" },
-                      "media-type" :
+                      "media-type" : 
                       { "title" : "Media Type",
                         "description" : "Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry.",
                         "type" : "string",
                         "pattern" : "^\\S(.*\\S)?$" },
-                      "hashes" :
+                      "hashes" : 
                       { "type" : "array",
                         "minItems" : 1,
-                        "items" :
+                        "items" : 
                         { "$ref" : "#field_oscal-metadata_hash" } } },
-                    "required" :
+                    "required" : 
                     [ "href" ],
                     "additionalProperties" : false } },
-                "base64" :
+                "base64" : 
                 { "title" : "Base64",
                   "description" : "The Base64 alphabet in RFC 2045 - aligned with XSD.",
                   "type" : "object",
-                  "properties" :
-                  { "filename" :
+                  "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.",
                       "type" : "string",
                       "format" : "uri-reference" },
-                    "media-type" :
+                    "media-type" : 
                     { "title" : "Media Type",
                       "description" : "Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry.",
                       "type" : "string",
                       "pattern" : "^\\S(.*\\S)?$" },
-                    "value" :
+                    "value" : 
                     { "type" : "string" } },
-                  "required" :
+                  "required" : 
                   [ "value" ],
                   "additionalProperties" : false },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "uuid" ],
               "additionalProperties" : false } } },
         "additionalProperties" : false },
-      "oscal-poam-oscal-metadata:property" :
+      "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" :
+        "properties" : 
+        { "name" : 
           { "title" : "Property Name",
             "description" : "A textual label that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "uuid" :
+          "uuid" : 
           { "title" : "Property Universally Unique Identifier",
             "description" : "A unique identifier that can be used to reference this property elsewhere in an OSCAL document. A UUID should be consistently used for a given location across revisions of the document.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "ns" :
+          "ns" : 
           { "title" : "Property Namespace",
             "description" : "A namespace qualifying the property's name. This allows different organizations to associate distinct semantics with the same name.",
             "type" : "string",
             "format" : "uri" },
-          "value" :
+          "value" : 
           { "title" : "Property Value",
             "description" : "Indicates the value of the attribute, characteristic, or quality.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "class" :
+          "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.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "name",
           "value" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-metadata:link" :
+      "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" :
+        "properties" : 
+        { "href" : 
           { "title" : "Hypertext Reference",
             "description" : "A resolvable URL reference to a resource.",
             "type" : "string",
             "format" : "uri-reference" },
-          "rel" :
+          "rel" : 
           { "title" : "Relation",
             "description" : "Describes the type of relationship provided by the link. This can be an indicator of the link's purpose.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "media-type" :
+          "media-type" : 
           { "title" : "Media Type",
             "description" : "Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "text" :
+          "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" :
+        "required" : 
         [ "href" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-metadata:responsible-party" :
+      "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" :
+        "properties" : 
+        { "role-id" : 
           { "title" : "Responsible Role",
             "description" : "The role that the party is responsible for.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "party-uuids" :
+          "party-uuids" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-metadata_party-uuid" } },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "role-id",
           "party-uuids" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-metadata:responsible-role" :
+      "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" :
+        "properties" : 
+        { "role-id" : 
           { "title" : "Responsible Role ID",
             "description" : "The role that is responsible for the business function.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "party-uuids" :
+          "party-uuids" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-metadata_party-uuid" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "role-id" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-metadata:hash" :
+      "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" :
+        "properties" : 
+        { "algorithm" : 
           { "title" : "Hash algorithm",
             "description" : "Method by which a hash is derived",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "value" :
+          "value" : 
           { "type" : "string" } },
-        "required" :
+        "required" : 
         [ "value",
           "algorithm" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-metadata:remarks" :
+      "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" :
+      "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",
         "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-9]{2}:[0-9]{2})$" },
-      "oscal-poam-oscal-metadata:last-modified" :
+      "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",
         "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-9]{2}:[0-9]{2})$" },
-      "oscal-poam-oscal-metadata:version" :
+      "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",
         "type" : "string",
         "pattern" : "^\\S(.*\\S)?$" },
-      "oscal-poam-oscal-metadata:oscal-version" :
+      "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",
         "type" : "string",
         "pattern" : "^\\S(.*\\S)?$" },
-      "oscal-poam-oscal-metadata:email-address" :
+      "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",
         "type" : "string",
         "format" : "email",
         "pattern" : "^.+@.+" },
-      "oscal-poam-oscal-metadata:telephone-number" :
+      "oscal-poam-oscal-metadata:telephone-number" : 
       { "title" : "Telephone Number",
         "description" : "Contact number by telephone.",
         "$id" : "#field_oscal-metadata_telephone-number",
         "type" : "object",
-        "properties" :
-        { "type" :
+        "properties" : 
+        { "type" : 
           { "title" : "type flag",
             "description" : "Indicates the type of phone number.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "number" :
+          "number" : 
           { "type" : "string" } },
-        "required" :
+        "required" : 
         [ "number" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-metadata:address" :
+      "oscal-poam-oscal-metadata:address" : 
       { "title" : "Address",
         "description" : "A postal address for the location.",
         "$id" : "#assembly_oscal-metadata_address",
         "type" : "object",
-        "properties" :
-        { "type" :
+        "properties" : 
+        { "type" : 
           { "title" : "Address Type",
             "description" : "Indicates the type of address.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "addr-lines" :
+          "addr-lines" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-metadata_addr-line" } },
-          "city" :
+          "city" : 
           { "title" : "City",
             "description" : "City, town or geographical region for the mailing address.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "state" :
+          "state" : 
           { "title" : "State",
             "description" : "State, province or analogous geographical region for mailing address",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "postal-code" :
+          "postal-code" : 
           { "title" : "Postal Code",
             "description" : "Postal or ZIP code for mailing address",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "country" :
+          "country" : 
           { "title" : "Country Code",
             "description" : "The ISO 3166-1 alpha-2 country code for the mailing address.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" } },
         "additionalProperties" : false },
-      "oscal-poam-oscal-metadata:addr-line" :
+      "oscal-poam-oscal-metadata:addr-line" : 
       { "title" : "Address line",
         "description" : "A single line of an address.",
         "$id" : "#field_oscal-metadata_addr-line",
         "type" : "string",
         "pattern" : "^\\S(.*\\S)?$" },
-      "oscal-poam-oscal-metadata:document-id" :
+      "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 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" :
+        "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.",
             "type" : "string",
             "format" : "uri" },
-          "identifier" :
+          "identifier" : 
           { "type" : "string" } },
-        "required" :
+        "required" : 
         [ "identifier" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-implementation-common:system-component" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Component Identifier",
             "description" : "The unique identifier for the component.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "type" :
+          "type" : 
           { "title" : "Component Type",
             "description" : "A category describing the purpose of the component.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "title" :
+          "title" : 
           { "title" : "Component Title",
             "description" : "A human readable name for the system component.",
             "type" : "string" },
-          "description" :
+          "description" : 
           { "title" : "Component Description",
             "description" : "A description of the component, including information about its function.",
             "type" : "string" },
-          "purpose" :
+          "purpose" : 
           { "title" : "Purpose",
             "description" : "A summary of the technological or business purpose of the component.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "status" :
+          "status" : 
           { "title" : "Status",
             "description" : "Describes the operational status of the system component.",
             "type" : "object",
-            "properties" :
-            { "state" :
+            "properties" : 
+            { "state" : 
               { "title" : "State",
                 "description" : "The operational status.",
                 "type" : "string",
                 "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$",
-                "enum" :
+                "enum" : 
                 [ "under-development",
                   "operational",
                   "disposition",
                   "other" ] },
-              "remarks" :
+              "remarks" : 
               { "$ref" : "#field_oscal-metadata_remarks" } },
-            "required" :
+            "required" : 
             [ "state" ],
             "additionalProperties" : false },
-          "responsible-roles" :
+          "responsible-roles" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "protocols" :
+          "protocols" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-implementation-common_protocol" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "type",
           "title",
           "description",
           "status" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-implementation-common:protocol" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Service Protocol Information Universally Unique Identifier",
             "description" : "A globally unique identifier that can be used to reference this service protocol entry elsewhere in an OSCAL document. A UUID should be consistently used for a given resource across revisions of the document.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "name" :
+          "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.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "title" :
+          "title" : 
           { "title" : "Protocol Title",
             "description" : "A human readable name for the protocol (e.g., Transport Layer Security).",
             "type" : "string" },
-          "port-ranges" :
+          "port-ranges" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-implementation-common_port-range" } } },
-        "required" :
+        "required" : 
         [ "name" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-implementation-common:port-range" :
+      "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" :
+        "properties" : 
+        { "start" : 
           { "title" : "Start",
             "description" : "Indicates the starting port number in a port range",
             "type" : "integer",
             "multipleOf" : 1,
             "minimum" : 0 },
-          "end" :
+          "end" : 
           { "title" : "End",
             "description" : "Indicates the ending port number in a port range",
             "type" : "integer",
             "multipleOf" : 1,
             "minimum" : 0 },
-          "transport" :
+          "transport" : 
           { "title" : "Transport",
             "description" : "Indicates the transport type.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$",
-            "enum" :
+            "enum" : 
             [ "TCP",
               "UDP" ] } },
         "additionalProperties" : false },
-      "oscal-poam-oscal-implementation-common:implementation-status" :
+      "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" :
+        "properties" : 
+        { "state" : 
           { "title" : "Implementation State",
             "description" : "Identifies the implementation status of the control or control objective.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "state" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-implementation-common:system-user" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "User Universally Unique Identifier",
             "description" : "The unique identifier for the user class.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "title" :
+          "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" :
+          "short-name" : 
           { "title" : "User Short Name",
             "description" : "A short common name, abbreviation, or acronym for the user.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$" },
-          "description" :
+          "description" : 
           { "title" : "User Description",
             "description" : "A summary of the user's purpose within the system.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "role-ids" :
+          "role-ids" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-metadata_role-id" } },
-          "authorized-privileges" :
+          "authorized-privileges" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-implementation-common_authorized-privilege" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-implementation-common:authorized-privilege" :
+      "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" :
+        "properties" : 
+        { "title" : 
           { "title" : "Privilege Title",
             "description" : "A human readable name for the privilege.",
             "type" : "string" },
-          "description" :
+          "description" : 
           { "title" : "Privilege Description",
             "description" : "A summary of the privilege's purpose within the system.",
             "type" : "string" },
-          "functions-performed" :
+          "functions-performed" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-implementation-common_function-performed" } } },
-        "required" :
+        "required" : 
         [ "title",
           "functions-performed" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-implementation-common:function-performed" :
+      "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",
         "type" : "string",
         "pattern" : "^\\S(.*\\S)?$" },
-      "oscal-poam-oscal-implementation-common:inventory-item" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Inventory Item Universally Unique Identifier",
             "description" : "A globally unique identifier that can be used to reference this inventory item entry elsewhere in an OSCAL document. A UUID should be consistently used for a given resource across revisions of the document.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "description" :
+          "description" : 
           { "title" : "Inventory Item Description",
             "description" : "A summary of the inventory item stating its purpose within the system.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "responsible-parties" :
+          "responsible-parties" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-          "implemented-components" :
+          "implemented-components" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Implemented Component",
               "description" : "The set of components that are implemented in a given system inventory item.",
               "type" : "object",
-              "properties" :
-              { "component-uuid" :
+              "properties" : 
+              { "component-uuid" : 
                 { "title" : "Component Universally Unique Identifier Reference",
                   "description" : "A reference to a component that is implemented as part of an inventory item.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "responsible-parties" :
+                "responsible-parties" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "component-uuid" ],
               "additionalProperties" : false } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "description" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-implementation-common:set-parameter" :
+      "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" :
+        "properties" : 
+        { "param-id" : 
           { "title" : "Parameter ID",
             "description" : "A reference to a parameter within a control, who's catalog has been imported into the current implementation context.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "values" :
+          "values" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Parameter Value",
               "description" : "A parameter value or set of values.",
               "type" : "string",
               "pattern" : "^\\S(.*\\S)?$" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "param-id",
           "values" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-implementation-common:system-id" :
+      "oscal-poam-oscal-implementation-common:system-id" : 
       { "title" : "System Identification",
         "description" : "A unique identifier for the system described by this system security plan.",
         "$id" : "#field_oscal-implementation-common_system-id",
         "type" : "object",
-        "properties" :
-        { "identifier-type" :
+        "properties" : 
+        { "identifier-type" : 
           { "title" : "Identification System Type",
             "description" : "Identifies the identification system from which the provided identifier was assigned.",
             "type" : "string",
             "format" : "uri" },
-          "id" :
+          "id" : 
           { "type" : "string" } },
-        "required" :
+        "required" : 
         [ "id" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-catalog-common:part" :
+      "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" :
+        "properties" : 
+        { "id" : 
           { "title" : "Part Identifier",
             "description" : "A unique identifier for a specific part instance. This identifier's uniqueness is document scoped and is intended to be consistent for the same part across minor revisions of the document.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "name" :
+          "name" : 
           { "title" : "Part Name",
             "description" : "A textual label that uniquely identifies the part's semantic type.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "ns" :
+          "ns" : 
           { "title" : "Part Namespace",
             "description" : "A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.",
             "type" : "string",
             "format" : "uri" },
-          "class" :
+          "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.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "title" :
+          "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" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "prose" :
+          "prose" : 
           { "title" : "Part Text",
             "description" : "Permits multiple paragraphs, lists, tables etc.",
             "type" : "string" },
-          "parts" :
+          "parts" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-catalog-common_part" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } } },
-        "required" :
+        "required" : 
         [ "name" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-catalog-common:parameter" :
+      "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" :
+        "properties" : 
+        { "id" : 
           { "title" : "Parameter Identifier",
             "description" : "A unique identifier for a specific parameter instance. This identifier's uniqueness is document scoped and is intended to be consistent for the same parameter across minor revisions of the document.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "class" :
+          "class" : 
           { "title" : "Parameter Class",
             "description" : "A textual label that provides a characterization of the parameter.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "depends-on" :
+          "depends-on" : 
           { "title" : "Depends on",
             "description" : "Another parameter invoking this one",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "label" :
+          "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" :
+          "usage" : 
           { "title" : "Parameter Usage Description",
             "description" : "Describes the purpose and use of a parameter",
             "type" : "string" },
-          "constraints" :
+          "constraints" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-catalog-common_parameter-constraint" } },
-          "guidelines" :
+          "guidelines" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-catalog-common_parameter-guideline" } },
-          "values" :
+          "values" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-catalog-common_parameter-value" } },
-          "select" :
+          "select" : 
           { "$ref" : "#assembly_oscal-catalog-common_parameter-selection" },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "id" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-catalog-common:parameter-constraint" :
+      "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" :
+        "properties" : 
+        { "description" : 
           { "title" : "Constraint Description",
             "description" : "A textual summary of the constraint to be applied.",
             "type" : "string" },
-          "tests" :
+          "tests" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Constraint Test",
               "description" : "A test expression which is expected to be evaluated by a tool.",
               "type" : "object",
-              "properties" :
-              { "expression" :
+              "properties" : 
+              { "expression" : 
                 { "title" : "Constraint test",
                   "description" : "A formal (executable) expression of a constraint",
                   "type" : "string",
                   "pattern" : "^\\S(.*\\S)?$" },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "expression" ],
               "additionalProperties" : false } } },
         "additionalProperties" : false },
-      "oscal-poam-oscal-catalog-common:parameter-guideline" :
+      "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" :
+        "properties" : 
+        { "prose" : 
           { "title" : "Guideline Text",
             "description" : "Prose permits multiple paragraphs, lists, tables etc.",
             "type" : "string" } },
-        "required" :
+        "required" : 
         [ "prose" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-catalog-common:parameter-value" :
+      "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",
         "type" : "string",
         "pattern" : "^\\S(.*\\S)?$" },
-      "oscal-poam-oscal-catalog-common:parameter-selection" :
+      "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" :
+        "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.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$",
-            "enum" :
+            "enum" : 
             [ "one",
               "one-or-more" ] },
-          "choice" :
+          "choice" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Choice",
               "description" : "A value selection among several such options",
               "type" : "string" } } },
         "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:import-ssp" :
+      "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" :
+        "properties" : 
+        { "href" : 
           { "title" : "System Security Plan Reference",
             "description" : ">A resolvable URL reference to the system security plan for the system being assessed.",
             "type" : "string",
             "format" : "uri-reference" },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "href" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:local-objective" :
+      "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" :
+        "properties" : 
+        { "control-id" : 
           { "title" : "Control Identifier Reference",
             "description" : "A reference to a control with a corresponding id value.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "description" :
+          "description" : 
           { "title" : "Objective Description",
             "description" : "A human-readable description of this control objective.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "parts" :
+          "parts" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-catalog-common_part" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "control-id",
           "parts" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:assessment-method" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Assessment Method Universally Unique Identifier",
             "description" : "Uniquely identifies this defined assessment method. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. A UUID should be consistently used for a given assessment method across revisions of the document.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "description" :
+          "description" : 
           { "title" : "Assessment Method Description",
             "description" : "A human-readable description of this assessment method.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "part" :
+          "part" : 
           { "$ref" : "#assembly_oscal-assessment-common_assessment-part" },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "part" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:activity" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Assessment Activity Universally Unique Identifier",
             "description" : "Uniquely identifies this assessment activity. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. A UUID should be consistently used for a given included activity across revisions of the document.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "title" :
+          "title" : 
           { "title" : "Included Activity Title",
             "description" : "The title for this included activity.",
             "type" : "string" },
-          "description" :
+          "description" : 
           { "title" : "Included Activity Description",
             "description" : "A human-readable description of this included activity.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "steps" :
+          "steps" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "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" :
+              "properties" : 
+              { "uuid" : 
                 { "title" : "Step Universally Unique Identifier",
                   "description" : "Uniquely identifies a step. This UUID may be referenced elsewhere in an OSCAL document when referring to this step. A UUID should be consistently used for a given test step across revisions of the document.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "title" :
+                "title" : 
                 { "title" : "Step Title",
                   "description" : "The title for this step.",
                   "type" : "string" },
-                "description" :
+                "description" : 
                 { "title" : "Step Description",
                   "description" : "A human-readable description of this step.",
                   "type" : "string" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "reviewed-controls" :
+                "reviewed-controls" : 
                 { "$ref" : "#assembly_oscal-assessment-common_reviewed-controls" },
-                "responsible-roles" :
+                "responsible-roles" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "uuid",
                 "description" ],
               "additionalProperties" : false } },
-          "related-controls" :
+          "related-controls" : 
           { "$ref" : "#assembly_oscal-assessment-common_reviewed-controls" },
-          "responsible-roles" :
+          "responsible-roles" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "description" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:task" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Task Universally Unique Identifier",
             "description" : "Uniquely identifies this assessment task.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "type" :
+          "type" : 
           { "title" : "Task Type",
             "description" : "The type of task.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "title" :
+          "title" : 
           { "title" : "Task Title",
             "description" : "The title for this task.",
             "type" : "string" },
-          "description" :
+          "description" : 
           { "title" : "Task Description",
             "description" : "A human-readable description of this task.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "timing" :
+          "timing" : 
           { "title" : "Event Timing",
             "description" : "The timing under which the task is intended to occur.",
             "type" : "object",
-            "properties" :
-            { "on-date" :
+            "properties" : 
+            { "on-date" : 
               { "title" : "On Date Condition",
                 "description" : "The task is intended to occur on the specified date.",
                 "type" : "object",
-                "properties" :
-                { "date" :
+                "properties" : 
+                { "date" : 
                   { "title" : "On Date Condition",
                     "description" : "The task must occur on the specified date.",
                     "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-9]{2}:[0-9]{2})$" } },
-                "required" :
+                "required" : 
                 [ "date" ],
                 "additionalProperties" : false },
-              "within-date-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" :
+                "properties" : 
+                { "start" : 
                   { "title" : "Start Date Condition",
                     "description" : "The task must occur on or after the specified date.",
                     "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-9]{2}:[0-9]{2})$" },
-                  "end" :
+                  "end" : 
                   { "title" : "End Date Condition",
                     "description" : "The task must occur on or before the specified date.",
                     "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-9]{2}:[0-9]{2})$" } },
-                "required" :
+                "required" : 
                 [ "start",
                   "end" ],
                 "additionalProperties" : false },
-              "at-frequency" :
+              "at-frequency" : 
               { "title" : "Frequency Condition",
                 "description" : "The task is intended to occur at the specified frequency.",
                 "type" : "object",
-                "properties" :
-                { "period" :
+                "properties" : 
+                { "period" : 
                   { "title" : "Period",
                     "description" : "The task must occur after the specified period has elapsed.",
                     "type" : "integer",
                     "multipleOf" : 1,
                     "minimum" : 1 },
-                  "unit" :
+                  "unit" : 
                   { "title" : "Time Unit",
                     "description" : "The unit of time for the period.",
                     "type" : "string",
                     "pattern" : "^\\S(.*\\S)?$",
-                    "enum" :
+                    "enum" : 
                     [ "seconds",
                       "minutes",
                       "hours",
                       "days",
                       "months",
                       "years" ] } },
-                "required" :
+                "required" : 
                 [ "period",
                   "unit" ],
                 "additionalProperties" : false } },
             "additionalProperties" : false },
-          "dependencies" :
+          "dependencies" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Task Dependency",
               "description" : "Used to indicate that a task is dependent on another task.",
               "type" : "object",
-              "properties" :
-              { "task-uuid" :
+              "properties" : 
+              { "task-uuid" : 
                 { "title" : "Task Universally Unique Identifier Reference",
                   "description" : "References a unique task by UUID.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "task-uuid" ],
               "additionalProperties" : false } },
-          "tasks" :
+          "tasks" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_task" } },
-          "associated-activities" :
+          "associated-activities" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Associated Activity",
               "description" : "Identifies an individual activity to be performed as part of a task.",
               "type" : "object",
-              "properties" :
-              { "activity-uuid" :
+              "properties" : 
+              { "activity-uuid" : 
                 { "title" : "Activity Universally Unique Identifier Reference",
                   "description" : "References an activity defined in the list of activities.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "responsible-roles" :
+                "responsible-roles" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-                "subjects" :
+                "subjects" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "activity-uuid",
                 "subjects" ],
               "additionalProperties" : false } },
-          "subjects" :
+          "subjects" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
-          "responsible-roles" :
+          "responsible-roles" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "type",
           "title" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:reviewed-controls" :
+      "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" :
+        "properties" : 
+        { "description" : 
           { "title" : "Control Objective Description",
             "description" : "A human-readable description of control objectives.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "control-selections" :
+          "control-selections" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "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" :
+              "properties" : 
+              { "description" : 
                 { "title" : "Assessed Controls Description",
                   "description" : "A human-readable description of in-scope controls specified for assessment.",
                   "type" : "string" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "include-all" :
+                "include-all" : 
                 { "title" : "All",
                   "description" : "A key word to indicate all.",
                   "type" : "object",
                   "additionalProperties" : false },
-                "include-controls" :
+                "include-controls" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-assessment-common_select-control-by-id" } },
-                "exclude-controls" :
+                "exclude-controls" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-assessment-common_select-control-by-id" } },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
               "additionalProperties" : false } },
-          "control-objective-selections" :
+          "control-objective-selections" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "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" :
+              "properties" : 
+              { "description" : 
                 { "title" : "Control Objectives Description",
                   "description" : "A human-readable description of this collection of control objectives.",
                   "type" : "string" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "include-all" :
+                "include-all" : 
                 { "title" : "All",
                   "description" : "A key word to indicate all.",
                   "type" : "object",
                   "additionalProperties" : false },
-                "include-objectives" :
+                "include-objectives" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-assessment-common_select-objective-by-id" } },
-                "exclude-objectives" :
+                "exclude-objectives" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-assessment-common_select-objective-by-id" } },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
               "additionalProperties" : false } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "control-selections" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:select-control-by-id" :
+      "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" :
+        "properties" : 
+        { "control-id" : 
           { "title" : "Control Identifier Reference",
             "description" : "A reference to a control with a corresponding id value.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "statement-ids" :
+          "statement-ids" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Include Specific Statements",
               "description" : "Used to constrain the selection to only specificity identified statements.",
               "type" : "string",
               "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" } } },
-        "required" :
+        "required" : 
         [ "control-id" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:select-objective-by-id" :
+      "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" :
+        "properties" : 
+        { "objective-id" : 
           { "title" : "Objective ID",
             "description" : "Points to an assessment objective.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" } },
-        "required" :
+        "required" : 
         [ "objective-id" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:assessment-subject-placeholder" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Assessment Subject Placeholder Universally Unique Identifier",
             "description" : "Uniquely identifies a set of assessment subjects that will be identified by a task or an activity that is part of a task.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "description" :
+          "description" : 
           { "title" : "Assessment Subject Placeholder Description",
             "description" : "A human-readable description of intent of this assessment subject placeholder.",
             "type" : "string" },
-          "sources" :
+          "sources" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Assessment Subject Source",
               "description" : "Assessment subjects will be identified while conducting the referenced activity-instance.",
               "type" : "object",
-              "properties" :
-              { "task-uuid" :
+              "properties" : 
+              { "task-uuid" : 
                 { "title" : "Task Universally Unique Identifier",
                   "description" : "Uniquely identifies an assessment activity to be performed as part of the event. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. A UUID should be consistently used for this schedule across revisions of the document.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" } },
-              "required" :
+              "required" : 
               [ "task-uuid" ],
               "additionalProperties" : false } },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "sources" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:assessment-subject" :
+      "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" :
+        "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.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "description" :
+          "description" : 
           { "title" : "Include Subjects Description",
             "description" : "A human-readable description of the collection of subjects being included in this assessment.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "include-all" :
+          "include-all" : 
           { "title" : "All",
             "description" : "A key word to indicate all.",
             "type" : "object",
             "additionalProperties" : false },
-          "include-subjects" :
+          "include-subjects" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_select-subject-by-id" } },
-          "exclude-subjects" :
+          "exclude-subjects" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_select-subject-by-id" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "type" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:select-subject-by-id" :
+      "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" :
+        "properties" : 
+        { "subject-uuid" : 
           { "title" : "Subject Universally Unique Identifier Reference",
             "description" : "A pointer to a component, inventory-item, location, party, user, or resource using it's UUID.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "type" :
+          "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.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "subject-uuid",
           "type" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:subject-reference" :
+      "oscal-poam-oscal-assessment-common:subject-reference" : 
       { "title" : "Identifies the Subject",
         "description" : "A pointer to a resource based on its universally unique identifier (UUID). 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" :
+        "properties" : 
+        { "subject-uuid" : 
           { "title" : "Subject Universally Unique Identifier Reference",
             "description" : "A pointer to a component, inventory-item, location, party, user, or resource using it's UUID.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "type" :
+          "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.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "title" :
+          "title" : 
           { "title" : "Subject Reference Title",
             "description" : "The title or name for the referenced subject.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "subject-uuid",
           "type" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:assessment-assets" :
+      "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" :
+        "properties" : 
+        { "components" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-implementation-common_system-component" } },
-          "assessment-platforms" :
+          "assessment-platforms" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Assessment Platform",
               "description" : "Used to represent the toolset used to perform aspects of the assessment.",
               "type" : "object",
-              "properties" :
-              { "uuid" :
+              "properties" : 
+              { "uuid" : 
                 { "title" : "Assessment Platform Universally Unique Identifier",
                   "description" : "Uniquely identifies this assessment Platform.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "title" :
+                "title" : 
                 { "title" : "Assessment Platform Title",
                   "description" : "The title or name for the assessment platform.",
                   "type" : "string" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "uses-components" :
+                "uses-components" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "title" : "Uses Component",
                     "description" : "The set of components that are used by the assessment platform.",
                     "type" : "object",
-                    "properties" :
-                    { "component-uuid" :
+                    "properties" : 
+                    { "component-uuid" : 
                       { "title" : "Component Universally Unique Identifier Reference",
                         "description" : "A reference to a component that is implemented as part of an inventory item.",
                         "type" : "string",
                         "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                      "props" :
+                      "props" : 
                       { "type" : "array",
                         "minItems" : 1,
-                        "items" :
+                        "items" : 
                         { "$ref" : "#assembly_oscal-metadata_property" } },
-                      "links" :
+                      "links" : 
                       { "type" : "array",
                         "minItems" : 1,
-                        "items" :
+                        "items" : 
                         { "$ref" : "#assembly_oscal-metadata_link" } },
-                      "responsible-parties" :
+                      "responsible-parties" : 
                       { "type" : "array",
                         "minItems" : 1,
-                        "items" :
+                        "items" : 
                         { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-                      "remarks" :
+                      "remarks" : 
                       { "$ref" : "#field_oscal-metadata_remarks" } },
-                    "required" :
+                    "required" : 
                     [ "component-uuid" ],
                     "additionalProperties" : false } },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "uuid" ],
               "additionalProperties" : false } } },
-        "required" :
+        "required" : 
         [ "assessment-platforms" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:finding-target" :
+      "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" :
+        "properties" : 
+        { "type" : 
           { "title" : "Finding Target Type",
             "description" : "Identifies the type of the target.",
             "type" : "string",
             "pattern" : "^\\S(.*\\S)?$",
-            "enum" :
+            "enum" : 
             [ "statement-id",
               "objective-id" ] },
-          "target-id" :
+          "target-id" : 
           { "title" : "Finding Target Identifier Reference",
             "description" : "Identifies the specific target qualified by the type.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "title" :
+          "title" : 
           { "title" : "Objective Status Title",
             "description" : "The title for this objective status.",
             "type" : "string" },
-          "description" :
+          "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" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "status" :
+          "status" : 
           { "title" : "Objective Status",
-            "description" : "A brief indication as to whether the objective is satisfied or not within a given system.",
-            "type" : "string",
-            "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$",
-            "enum" :
-            [ "satisfied",
-              "not-satisfied" ] },
-          "" :
-          { "anyOf" :
-            [
+            "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.",
+                "type" : "string",
+                "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$",
+                "enum" : 
+                [ "satisfied",
+                  "not-satisfied" ] },
+              "reason" : 
               { "title" : "Objective Status Reason",
                 "description" : "The reason the objective was given it's status.",
-                "type" : "string" },
-
-              { "type" : "array",
-                "minItems" : 1,
-                "items" :
-                { "title" : "Objective Status Reason",
-                  "description" : "The reason the objective was given it's status.",
-                  "type" : "string" } } ] },
-          "implementation-status" :
+                "type" : "string",
+                "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
+              "remarks" : 
+              { "$ref" : "#field_oscal-metadata_remarks" } },
+            "required" : 
+            [ "state" ],
+            "additionalProperties" : false },
+          "implementation-status" : 
           { "$ref" : "#assembly_oscal-implementation-common_implementation-status" },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "type",
           "target-id",
           "status" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:observation" :
+      "oscal-poam-oscal-assessment-common:observation" : 
       { "title" : "Observation",
         "description" : "Describes an individual observation.",
         "$id" : "#assembly_oscal-assessment-common_observation",
         "type" : "object",
-        "properties" :
-        { "uuid" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Observation Universally Unique Identifier",
             "description" : "Uniquely identifies this observation. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. Once assigned, a UUID should be consistently used for a given observation across revisions.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "title" :
+          "title" : 
           { "title" : "Observation Title",
             "description" : "The title for this observation.",
             "type" : "string" },
-          "description" :
+          "description" : 
           { "title" : "Observation Description",
             "description" : "A human-readable description of this assessment observation.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "methods" :
+          "methods" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Observation Method",
               "description" : "Identifies how the observation was made.",
               "type" : "string",
               "pattern" : "^\\S(.*\\S)?$" } },
-          "types" :
+          "types" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Observation Type",
               "description" : "Identifies the nature of the observation. More than one may be used to further qualify and enable filtering.",
               "type" : "string",
               "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" } },
-          "origins" :
+          "origins" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_origin" } },
-          "subjects" :
+          "subjects" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_subject-reference" } },
-          "relevant-evidence" :
+          "relevant-evidence" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Relevant Evidence",
               "description" : "Links this observation to relevant evidence.",
               "type" : "object",
-              "properties" :
-              { "href" :
+              "properties" : 
+              { "href" : 
                 { "title" : "Relevant Evidence Reference",
                   "description" : ">A resolvable URL reference to relevant evidence.",
                   "type" : "string",
                   "format" : "uri-reference" },
-                "description" :
+                "description" : 
                 { "title" : "Relevant Evidence Description",
                   "description" : "A human-readable description of this evidence.",
                   "type" : "string" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "description" ],
               "additionalProperties" : false } },
-          "collected" :
+          "collected" : 
           { "title" : "collected field",
             "description" : "Date/time stamp identifying when the finding information was collected.",
             "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-9]{2}:[0-9]{2})$" },
-          "expires" :
+          "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.",
             "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-9]{2}:[0-9]{2})$" },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "description",
           "methods",
           "collected" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:origin" :
+      "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" :
+        "properties" : 
+        { "actors" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_origin-actor" } },
-          "related-tasks" :
+          "related-tasks" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_related-task" } } },
-        "required" :
+        "required" : 
         [ "actors" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:origin-actor" :
+      "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" :
+        "properties" : 
+        { "type" : 
           { "title" : "Actor Type",
             "description" : "The kind of actor.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$",
-            "enum" :
+            "enum" : 
             [ "tool",
               "assessment-platform",
               "party" ] },
-          "actor-uuid" :
+          "actor-uuid" : 
           { "title" : "Actor Universally Unique Identifier Reference",
             "description" : "A pointer to the tool or person based on the associated type.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "role-id" :
+          "role-id" : 
           { "title" : "Actor Role",
             "description" : "For a party, this can optionally be used to specify the role the actor was performing.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } } },
-        "required" :
+        "required" : 
         [ "type",
           "actor-uuid" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:related-task" :
+      "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" :
+        "properties" : 
+        { "task-uuid" : 
           { "title" : "Task Universally Unique Identifier Reference",
             "description" : "References a unique task by UUID.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "responsible-parties" :
+          "responsible-parties" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-          "subjects" :
+          "subjects" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
-          "identified-subject" :
+          "identified-subject" : 
           { "title" : "Identified Subject",
             "description" : "Used to detail assessment subjects that were identfied by this task.",
             "type" : "object",
-            "properties" :
-            { "subject-placeholder-uuid" :
+            "properties" : 
+            { "subject-placeholder-uuid" : 
               { "title" : "Assessment Subject Placeholder Universally Unique Identifier Reference",
                 "description" : "References a unique assessment subject placeholder defined by this task.",
                 "type" : "string",
                 "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-              "subjects" :
+              "subjects" : 
               { "type" : "array",
                 "minItems" : 1,
-                "items" :
+                "items" : 
                 { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } } },
-            "required" :
+            "required" : 
             [ "subject-placeholder-uuid",
               "subjects" ],
             "additionalProperties" : false },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "task-uuid" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:threat-id" :
+      "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" :
+        "properties" : 
+        { "system" : 
           { "title" : "Threat Type Identification System",
             "description" : "Specifies the source of the threat information.",
             "type" : "string",
             "format" : "uri" },
-          "href" :
+          "href" : 
           { "title" : "Threat Information Resource Reference",
             "description" : "An optional location for the threat data, from which this ID originates.",
             "type" : "string",
             "format" : "uri-reference" },
-          "id" :
+          "id" : 
           { "type" : "string" } },
-        "required" :
+        "required" : 
         [ "id",
           "system" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:risk" :
+      "oscal-poam-oscal-assessment-common:risk" : 
       { "title" : "Identified Risk",
         "description" : "An identified risk.",
         "$id" : "#assembly_oscal-assessment-common_risk",
         "type" : "object",
-        "properties" :
-        { "uuid" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Risk Universally Unique Identifier",
             "description" : "Uniquely identifies this risk. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. Once assigned, a UUID should be consistently used for a given risk across revisions.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "title" :
+          "title" : 
           { "title" : "Risk Title",
             "description" : "The title for this risk.",
             "type" : "string" },
-          "description" :
+          "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" :
+          "statement" : 
           { "title" : "Risk Statement",
             "description" : "An summary of impact for how the risk affects the system.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "status" :
+          "status" : 
           { "title" : "Status",
             "description" : "Describes the status of the associated risk.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "origins" :
+          "origins" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_origin" } },
-          "threat-ids" :
+          "threat-ids" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#field_oscal-assessment-common_threat-id" } },
-          "characterizations" :
+          "characterizations" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_characterization" } },
-          "mitigating-factors" :
+          "mitigating-factors" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "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" :
+              "properties" : 
+              { "uuid" : 
                 { "title" : "Mitigating Factor Universally Unique Identifier",
                   "description" : "Uniquely identifies this mitigating factor. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. Once assigned, a UUID should be consistently used for a given mitigating factor across revisions.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "implementation-uuid" :
+                "implementation-uuid" : 
                 { "title" : "Implementation UUID",
                   "description" : "Points to an implementation statement in the SSP.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "description" :
+                "description" : 
                 { "title" : "Mitigating Factor Description",
                   "description" : "A human-readable description of this mitigating factor.",
                   "type" : "string" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "subjects" :
+                "subjects" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-assessment-common_subject-reference" } } },
-              "required" :
+              "required" : 
               [ "uuid",
                 "description" ],
               "additionalProperties" : false } },
-          "deadline" :
+          "deadline" : 
           { "title" : "Risk Resolution Deadline",
             "description" : "The date/time by which the risk must be resolved.",
             "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-9]{2}:[0-9]{2})$" },
-          "remediations" :
+          "remediations" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_response" } },
-          "risk-log" :
+          "risk-log" : 
           { "title" : "Risk Log",
             "description" : "A log of all risk-related tasks taken.",
             "type" : "object",
-            "properties" :
-            { "entries" :
+            "properties" : 
+            { "entries" : 
               { "type" : "array",
                 "minItems" : 1,
-                "items" :
+                "items" : 
                 { "title" : "Risk Log Entry",
                   "description" : "Identifies an individual risk response that occurred as part of managing an identified risk.",
                   "type" : "object",
-                  "properties" :
-                  { "uuid" :
+                  "properties" : 
+                  { "uuid" : 
                     { "title" : "Risk Log Entry Universally Unique Identifier",
                       "description" : "Uniquely identifies a risk log entry. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. A UUID should be consistently used for this schedule across revisions of the document.",
                       "type" : "string",
                       "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                    "title" :
+                    "title" : 
                     { "title" : "Title",
                       "description" : "The title for this risk log entry.",
                       "type" : "string" },
-                    "description" :
+                    "description" : 
                     { "title" : "Risk Task Description",
                       "description" : "A human-readable description of what was done regarding the risk.",
                       "type" : "string" },
-                    "start" :
+                    "start" : 
                     { "title" : "Start",
                       "description" : "Identifies the start date and time of the event.",
                       "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-9]{2}:[0-9]{2})$" },
-                    "end" :
+                    "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.",
                       "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-9]{2}:[0-9]{2})$" },
-                    "props" :
+                    "props" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "$ref" : "#assembly_oscal-metadata_property" } },
-                    "links" :
+                    "links" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "$ref" : "#assembly_oscal-metadata_link" } },
-                    "logged-by" :
+                    "logged-by" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "$ref" : "#assembly_oscal-assessment-common_logged-by" } },
-                    "status-change" :
+                    "status-change" : 
                     { "$ref" : "#field_oscal-assessment-common_risk-status" },
-                    "related-responses" :
+                    "related-responses" : 
                     { "type" : "array",
                       "minItems" : 1,
-                      "items" :
+                      "items" : 
                       { "title" : "Risk Response Reference",
                         "description" : "Identifies an individual risk response that this log entry is for.",
                         "type" : "object",
-                        "properties" :
-                        { "response-uuid" :
+                        "properties" : 
+                        { "response-uuid" : 
                           { "title" : "Response Universally Unique Identifier Reference",
                             "description" : "References a unique risk response by UUID.",
                             "type" : "string",
                             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                          "props" :
+                          "props" : 
                           { "type" : "array",
                             "minItems" : 1,
-                            "items" :
+                            "items" : 
                             { "$ref" : "#assembly_oscal-metadata_property" } },
-                          "links" :
+                          "links" : 
                           { "type" : "array",
                             "minItems" : 1,
-                            "items" :
+                            "items" : 
                             { "$ref" : "#assembly_oscal-metadata_link" } },
-                          "related-tasks" :
+                          "related-tasks" : 
                           { "type" : "array",
                             "minItems" : 1,
-                            "items" :
+                            "items" : 
                             { "$ref" : "#assembly_oscal-assessment-common_related-task" } },
-                          "remarks" :
+                          "remarks" : 
                           { "$ref" : "#field_oscal-metadata_remarks" } },
-                        "required" :
+                        "required" : 
                         [ "response-uuid" ],
                         "additionalProperties" : false } },
-                    "remarks" :
+                    "remarks" : 
                     { "$ref" : "#field_oscal-metadata_remarks" } },
-                  "required" :
+                  "required" : 
                   [ "uuid",
                     "start" ],
                   "additionalProperties" : false } } },
-            "required" :
+            "required" : 
             [ "entries" ],
             "additionalProperties" : false },
-          "related-observations" :
+          "related-observations" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "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" :
+              "properties" : 
+              { "observation-uuid" : 
                 { "title" : "Observation Universally Unique Identifier Reference",
                   "description" : "References an observation defined in the list of observations.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" } },
-              "required" :
+              "required" : 
               [ "observation-uuid" ],
               "additionalProperties" : false } } },
-        "required" :
+        "required" : 
         [ "uuid",
           "title",
           "description",
           "statement",
           "status" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:logged-by" :
+      "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" :
+        "properties" : 
+        { "party-uuid" : 
           { "title" : "Party UUID Reference",
             "description" : "A pointer to the party who is making the log entry.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "role-id" :
+          "role-id" : 
           { "title" : "Actor Role",
             "description" : "A point to the role-id of the role in which the party is making the log entry.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" } },
-        "required" :
+        "required" : 
         [ "party-uuid" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:risk-status" :
+      "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",
         "type" : "string",
         "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-      "oscal-poam-oscal-assessment-common:characterization" :
+      "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" :
+        "properties" : 
+        { "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "origin" :
+          "origin" : 
           { "$ref" : "#assembly_oscal-assessment-common_origin" },
-          "facets" :
+          "facets" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Facet",
               "description" : "An individual characteristic that is part of a larger set produced by the same actor.",
               "type" : "object",
-              "properties" :
-              { "name" :
+              "properties" : 
+              { "name" : 
                 { "title" : "Facet Name",
                   "description" : "The name of the risk metric within the specified system.",
                   "type" : "string",
                   "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-                "system" :
+                "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.",
                   "type" : "string",
                   "format" : "uri" },
-                "value" :
+                "value" : 
                 { "title" : "Facet Value",
                   "description" : "Indicates the value of the facet.",
                   "type" : "string",
                   "pattern" : "^\\S(.*\\S)?$" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "name",
                 "system",
                 "value" ],
               "additionalProperties" : false } } },
-        "required" :
+        "required" : 
         [ "origin",
           "facets" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:response" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Remediation Universally Unique Identifier",
             "description" : "Uniquely identifies this remediation. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. Once assigned, a UUID should be consistently used for a given remediation across revisions.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "lifecycle" :
+          "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.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "title" :
+          "title" : 
           { "title" : "Response Title",
             "description" : "The title for this response activity.",
             "type" : "string" },
-          "description" :
+          "description" : 
           { "title" : "Response Description",
             "description" : "A human-readable description of this response plan.",
             "type" : "string" },
-          "props" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "origins" :
+          "origins" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_origin" } },
-          "required-assets" :
+          "required-assets" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "title" : "Required Asset",
               "description" : "Identifies an asset required to achieve remediation.",
               "type" : "object",
-              "properties" :
-              { "uuid" :
+              "properties" : 
+              { "uuid" : 
                 { "title" : "Required Universally Unique Identifier",
                   "description" : "Uniquely identifies this required asset. This UUID may be referenced elsewhere in an OSCAL document when referring to this information. Once assigned, a UUID should be consistently used for a given required asset across revisions.",
                   "type" : "string",
                   "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-                "subjects" :
+                "subjects" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-assessment-common_subject-reference" } },
-                "title" :
+                "title" : 
                 { "title" : "Title for Required Asset",
                   "description" : "The title for this required asset.",
                   "type" : "string" },
-                "description" :
+                "description" : 
                 { "title" : "Description of Required Asset",
                   "description" : "A human-readable description of this required asset.",
                   "type" : "string" },
-                "props" :
+                "props" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" :
+                "links" : 
                 { "type" : "array",
                   "minItems" : 1,
-                  "items" :
+                  "items" : 
                   { "$ref" : "#assembly_oscal-metadata_link" } },
-                "remarks" :
+                "remarks" : 
                 { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" :
+              "required" : 
               [ "uuid",
                 "description" ],
               "additionalProperties" : false } },
-          "tasks" :
+          "tasks" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_task" } },
-          "remarks" :
+          "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" :
+        "required" : 
         [ "uuid",
           "lifecycle",
           "title",
           "description" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:assessment-part" :
+      "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" :
+        "properties" : 
+        { "uuid" : 
           { "title" : "Part Identifier",
             "description" : "A unique identifier for a specific part instance. This identifier's uniqueness is document scoped and is intended to be consistent for the same part across minor revisions of the document.",
             "type" : "string",
             "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" },
-          "name" :
+          "name" : 
           { "title" : "Part Name",
             "description" : "A textual label that uniquely identifies the part's semantic type.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "ns" :
+          "ns" : 
           { "title" : "Part Namespace",
             "description" : "A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.",
             "type" : "string",
             "format" : "uri" },
-          "class" :
+          "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.",
             "type" : "string",
             "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" },
-          "title" :
+          "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" :
+          "props" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "prose" :
+          "prose" : 
           { "title" : "Part Text",
             "description" : "Permits multiple paragraphs, lists, tables etc.",
             "type" : "string" },
-          "parts" :
+          "parts" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-assessment-common_assessment-part" } },
-          "links" :
+          "links" : 
           { "type" : "array",
             "minItems" : 1,
-            "items" :
+            "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } } },
-        "required" :
+        "required" : 
         [ "name" ],
         "additionalProperties" : false } },
-    "properties" :
-    { "plan-of-action-and-milestones" :
+    "properties" : 
+    { "plan-of-action-and-milestones" : 
       { "$ref" : "#assembly_oscal-poam_plan-of-action-and-milestones" } },
-    "required" :
+    "required" : 
     [ "plan-of-action-and-milestones" ],
     "additionalProperties" : false,
-    "maxProperties" : 1 }
+    "maxProperties" : 1 }
\ 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 ade21519f2..c7658d7e26 100644
--- a/xml/convert/oscal_assessment-plan_json-to-xml-converter.xsl
+++ b/xml/convert/oscal_assessment-plan_json-to-xml-converter.xsl
@@ -78,7 +78,7 @@
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan"
                 name="assessment-plan"
                 key="assessment-plan"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-plan_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-plan_metaschema.xml"
                 _key-name="oscal-ap:assessment-plan"
                 _using-root-name="assessment-plan"
                 gi="assessment-plan">
@@ -107,7 +107,7 @@
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan/metadata"
                 name="metadata"
                 key="metadata"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:metadata"
                 _step="metadata"
                 _key="metadata"
@@ -141,7 +141,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/revision/prop"
                 _metaschema-json-id="/assembly/oscal-metadata/revision/props"
                 name="property"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:property"
                 _step="prop"
                 _key="props"
@@ -164,7 +164,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/revision/link"
                 _metaschema-json-id="/assembly/oscal-metadata/revision/links"
                 name="link"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:link"
                 _step="link"
                 _key="links"
@@ -185,7 +185,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/role"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/roles"
                 name="role"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:role"
                 _step="role"
                 _key="roles"
@@ -209,7 +209,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/location"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/locations"
                 name="location"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:location"
                 _step="location"
                 _key="locations"
@@ -235,7 +235,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/party"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/parties"
                 name="party"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:party"
                 _step="party"
                 _key="parties"
@@ -265,7 +265,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/responsible-party"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/responsible-parties"
                 name="responsible-party"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:responsible-party"
                 _step="responsible-party"
                 _key="responsible-parties"
@@ -288,7 +288,7 @@
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan/import-ssp"
                 name="import-ssp"
                 key="import-ssp"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:import-ssp"
                 _step="import-ssp"
                 _key="import-ssp"
@@ -310,7 +310,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/local-definitions/component"
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan/local-definitions/components"
                 name="system-component"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:system-component"
                 _step="component"
                 _key="components"
@@ -338,7 +338,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/responsible-role"
                 _metaschema-json-id="/assembly/oscal-implementation-common/system-component/responsible-roles"
                 name="responsible-role"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:responsible-role"
                 _step="responsible-role"
                 _key="responsible-roles"
@@ -360,7 +360,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/protocol"
                 _metaschema-json-id="/assembly/oscal-implementation-common/system-component/protocols"
                 name="protocol"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:protocol"
                 _step="protocol"
                 _key="protocols"
@@ -382,7 +382,7 @@
                 _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/port-range"
                 _metaschema-json-id="/assembly/oscal-implementation-common/protocol/port-ranges"
                 name="port-range"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:port-range"
                 _step="port-range"
                 _key="port-ranges"
@@ -402,7 +402,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/local-definitions/inventory-item"
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan/local-definitions/inventory-items"
                 name="inventory-item"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:inventory-item"
                 _step="inventory-item"
                 _key="inventory-items"
@@ -426,7 +426,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/local-definitions/user"
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan/local-definitions/users"
                 name="system-user"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:system-user"
                 _step="user"
                 _key="users"
@@ -452,7 +452,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/authorized-privilege"
                 _metaschema-json-id="/assembly/oscal-implementation-common/system-user/authorized-privileges"
                 name="authorized-privilege"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:authorized-privilege"
                 _step="authorized-privilege"
                 _key="authorized-privileges"
@@ -472,7 +472,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/local-definitions/objectives-and-methods"
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan/local-definitions/objectives-and-methods"
                 name="local-objective"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:local-objective"
                 _step="objectives-and-methods"
                 _key="objectives-and-methods"
@@ -495,7 +495,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/local-objective/part"
                 _metaschema-json-id="/assembly/oscal-assessment-common/local-objective/parts"
                 name="part"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
                 _key-name="oscal-catalog-common:part"
                 _step="part"
                 _key="parts"
@@ -521,7 +521,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/terms-and-conditions/part"
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan/terms-and-conditions/parts"
                 name="assessment-part"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:assessment-part"
                 _step="part"
                 _key="parts"
@@ -547,7 +547,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/local-definitions/activity"
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan/local-definitions/activities"
                 name="activity"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:activity"
                 _step="activity"
                 _key="activities"
@@ -574,7 +574,7 @@
                 _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps/reviewed-controls"
                 name="reviewed-controls"
                 key="reviewed-controls"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:reviewed-controls"
                 _step="reviewed-controls"
                 _key="reviewed-controls"
@@ -601,7 +601,7 @@
                 _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/include-objective"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/include-objectives"
                 name="select-objective-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-objective-by-id"
                 _step="include-objective"
                 _key="include-objectives"
@@ -620,7 +620,7 @@
                 _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/exclude-objective"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/exclude-objectives"
                 name="select-objective-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-objective-by-id"
                 _step="exclude-objective"
                 _key="exclude-objectives"
@@ -639,7 +639,7 @@
                 _metaschema-json-id="/assembly/oscal-assessment-common/activity/related-controls"
                 name="reviewed-controls"
                 key="related-controls"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:reviewed-controls"
                 _step="related-controls"
                 _key="related-controls"
@@ -665,7 +665,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/assessment-subject"
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan/assessment-subjects"
                 name="assessment-subject"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:assessment-subject"
                 _step="assessment-subject"
                 _key="assessment-subjects"
@@ -690,7 +690,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-subjects"
                 name="select-subject-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-subject-by-id"
                 _step="include-subject"
                 _key="include-subjects"
@@ -712,7 +712,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/exclude-subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/exclude-subjects"
                 name="select-subject-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-subject-by-id"
                 _step="exclude-subject"
                 _key="exclude-subjects"
@@ -735,7 +735,7 @@
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan/assessment-assets"
                 name="assessment-assets"
                 key="assessment-assets"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:assessment-assets"
                 _step="assessment-assets"
                 _key="assessment-assets"
@@ -757,7 +757,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/task"
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan/tasks"
                 name="task"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:task"
                 _step="task"
                 _key="tasks"
@@ -787,7 +787,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/task/associated-activity/subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/task/associated-activities/subjects"
                 name="assessment-subject"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:assessment-subject"
                 _step="subject"
                 _key="subjects"
@@ -813,7 +813,7 @@
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan/back-matter"
                 name="back-matter"
                 key="back-matter"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:back-matter"
                 _step="back-matter"
                 _key="back-matter"
@@ -828,7 +828,7 @@
          <xsl:apply-templates select="*[@key='resources']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:[@key='remarks']">
+   <xsl:template match="j:string[@key='remarks']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="remarks" -->
       <field _metaschema-xml-id="/assembly/oscal-metadata/property/remarks"
@@ -838,7 +838,7 @@
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:remarks"
              _step="remarks"
              _key="remarks"
@@ -851,14 +851,17 @@
          <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:[@key='remarks']" mode="get-value-property" priority="8">
-      <value>
+   <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:">
+   <xsl:template match="j:array[@key='location-uuids']/j:string">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="location-uuid" -->
       <field _metaschema-xml-id="/assembly/oscal-metadata/party/location-uuid"
@@ -866,7 +869,7 @@
              collapsible="no"
              as-type="uuid"
              name="location-uuid"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:location-uuid"
              _step="location-uuid"
              _key="location-uuids"
@@ -875,16 +878,18 @@
              _in-xml-name="location-uuid"
              _in-json-name="location-uuids"
              gi="location-uuid"
-             in-json="SCALAR"/>
+             in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="j:array[@key='location-uuids']/j:"
+   <xsl:template match="j:array[@key='location-uuids']/j:string"
                  mode="get-value-property"
                  priority="8">
-      <value>
+      <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:array[@key='party-uuids']/j:">
+   <xsl:template match="j:array[@key='party-uuids']/j:string">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="party-uuid" -->
       <field _metaschema-xml-id="/assembly/oscal-metadata/responsible-party/party-uuid"
@@ -892,7 +897,7 @@
              collapsible="no"
              as-type="uuid"
              name="party-uuid"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:party-uuid"
              _step="party-uuid"
              _key="party-uuids"
@@ -901,16 +906,18 @@
              _in-xml-name="party-uuid"
              _in-json-name="party-uuids"
              gi="party-uuid"
-             in-json="SCALAR"/>
+             in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="j:array[@key='party-uuids']/j:"
+   <xsl:template match="j:array[@key='party-uuids']/j:string"
                  mode="get-value-property"
                  priority="7">
-      <value>
+      <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="(j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:array[@key='role-ids']/j: | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'])">
+   <xsl:template match="(j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:array[@key='role-ids']/j:string | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'])">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="role-id" -->
       <field _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/role-id"
@@ -918,7 +925,7 @@
              collapsible="no"
              as-type="token"
              name="role-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:role-id"
              _step="role-id"
              _key="role-ids"
@@ -927,16 +934,18 @@
              _in-xml-name="role-id"
              _in-json-name="role-ids"
              gi="role-id"
-             in-json="SCALAR"/>
+             in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="(j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:array[@key='role-ids']/j: | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'])"
+   <xsl:template match="(j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:array[@key='role-ids']/j:string | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'])"
                  mode="get-value-property"
                  priority="7">
-      <value>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:array[@key='functions-performed']/j:">
+   <xsl:template match="j:array[@key='functions-performed']/j:string">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="function-performed" -->
       <field _metaschema-xml-id="/assembly/oscal-implementation-common/authorized-privilege/function-performed"
@@ -944,7 +953,7 @@
              collapsible="no"
              as-type="string"
              name="function-performed"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
              _key-name="oscal-implementation-common:function-performed"
              _step="function-performed"
              _key="functions-performed"
@@ -953,12 +962,14 @@
              _in-xml-name="function-performed"
              _in-json-name="functions-performed"
              gi="function-performed"
-             in-json="SCALAR"/>
+             in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="j:array[@key='functions-performed']/j:"
+   <xsl:template match="j:array[@key='functions-performed']/j:string"
                  mode="get-value-property"
                  priority="9">
-      <value>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -970,7 +981,7 @@
              collapsible="no"
              as-type="string"
              name="hash"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:hash"
              _step="hash"
              _key="hashes"
@@ -1148,7 +1159,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/link/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -1228,7 +1239,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/address/type"
             name="location-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:location-type"
             _step="type"
             _key="type"
@@ -1385,7 +1396,7 @@
             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/type"
             name="system-component-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
             _key-name="oscal-implementation-common:system-component-type"
             _step="type"
             _key="type"
@@ -1599,7 +1610,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/local-objective/control-id"
             name="control-id"
             key="control-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
             _key-name="oscal-catalog-common:control-id"
             _step="control-id"
             _key="control-id"
@@ -1736,7 +1747,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/control-id"
             name="control-id"
             key="control-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
             _key-name="oscal-catalog-common:control-id"
             _step="control-id"
             _key="control-id"
@@ -1758,7 +1769,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/select-objective-by-id/objective-id"
             name="objective-id"
             key="objective-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
             _key-name="oscal-assessment-common:objective-id"
             _step="objective-id"
             _key="objective-id"
@@ -1875,7 +1886,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/select-subject-by-id/subject-uuid"
             name="subject-uuid"
             key="subject-uuid"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
             _key-name="oscal-assessment-common:subject-uuid"
             _step="subject-uuid"
             _key="subject-uuid"
@@ -1897,7 +1908,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/select-subject-by-id/type"
             name="subject-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
             _key-name="oscal-assessment-common:subject-type"
             _step="type"
             _key="type"
@@ -2177,7 +2188,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -2238,7 +2249,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -2253,7 +2264,7 @@
    <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>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:[@key='title']"
+   <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" -->
@@ -2273,16 +2284,17 @@
          <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:[@key='title']"
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:string[@key='title']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='published']"
+   <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/metadata/published" -->
@@ -2292,7 +2304,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -2305,16 +2317,17 @@
          <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-plan']/j:map[@key='metadata']/j:[@key='published']"
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:string[@key='published']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='last-modified']"
+   <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/metadata/last-modified" -->
@@ -2324,7 +2337,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -2337,16 +2350,17 @@
          <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-plan']/j:map[@key='metadata']/j:[@key='last-modified']"
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:string[@key='last-modified']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='version']"
+   <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/metadata/version" -->
@@ -2356,7 +2370,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -2369,16 +2383,17 @@
          <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-plan']/j:map[@key='metadata']/j:[@key='version']"
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:string[@key='version']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='oscal-version']"
+   <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/metadata/oscal-version" -->
@@ -2388,7 +2403,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -2401,12 +2416,13 @@
          <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:[@key='oscal-version']"
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:string[@key='oscal-version']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -2417,7 +2433,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/revisions/revision"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/revisions"
                 name="revision"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:revision"
                 _step="revisions/revision"
                 _key="revisions"
@@ -2445,7 +2461,7 @@
              group-json="ARRAY"
              name="revision"
              key="revisions"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:revision"
              _key-ref="oscal-metadata:revision">
          <xsl:if test="$with-key">
@@ -2454,7 +2470,7 @@
          <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:[@key='title']"
+   <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" -->
@@ -2474,16 +2490,17 @@
          <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:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='published']"
+   <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/metadata/revisions/revision/published" -->
@@ -2493,7 +2510,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -2506,16 +2523,17 @@
          <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-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='published']"
+   <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>
+      <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:[@key='last-modified']"
+   <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/metadata/revisions/revision/last-modified" -->
@@ -2525,7 +2543,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -2538,16 +2556,17 @@
          <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-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='last-modified']"
+   <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>
+      <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:[@key='version']"
+   <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/metadata/revisions/revision/version" -->
@@ -2557,7 +2576,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -2570,16 +2589,17 @@
          <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-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='version']"
+   <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>
+      <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:[@key='oscal-version']"
+   <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/metadata/revisions/revision/oscal-version" -->
@@ -2589,7 +2609,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -2602,16 +2622,17 @@
          <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:[@key='oscal-version']"
+   <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>
+      <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:[@key='text']"
+   <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/metadata/revisions/revision/link/text" -->
@@ -2631,12 +2652,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -2649,7 +2671,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -2669,7 +2691,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -2689,16 +2711,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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" -->
@@ -2718,16 +2741,17 @@
          <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:array[@key='roles']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='short-name']"
+   <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/metadata/role/short-name" -->
@@ -2747,16 +2771,17 @@
          <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='metadata']/j:array[@key='roles']/j:map/j:[@key='short-name']"
+   <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>
+      <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:[@key='description']"
+   <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/metadata/role/description" -->
@@ -2777,16 +2802,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/metadata/role/link/text" -->
@@ -2806,16 +2832,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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" -->
@@ -2835,12 +2862,13 @@
          <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:array[@key='locations']/j:map/j:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -2852,7 +2880,7 @@
                 _metaschema-json-id="/assembly/oscal-metadata/location/address"
                 name="address"
                 key="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="address"
@@ -2872,7 +2900,7 @@
          <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:"
+   <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" -->
@@ -2881,7 +2909,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -2890,16 +2918,18 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='city']"
+   <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/metadata/location/address/city" -->
@@ -2919,16 +2949,17 @@
          <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='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:[@key='city']"
+   <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>
+      <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:[@key='state']"
+   <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/metadata/location/address/state" -->
@@ -2948,16 +2979,17 @@
          <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-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:[@key='state']"
+   <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>
+      <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:[@key='postal-code']"
+   <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/metadata/location/address/postal-code" -->
@@ -2977,16 +3009,17 @@
          <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-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:[@key='postal-code']"
+   <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>
+      <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:[@key='country']"
+   <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/metadata/location/address/country" -->
@@ -3006,16 +3039,17 @@
          <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='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:[@key='country']"
+   <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>
+      <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:"
+   <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" -->
@@ -3024,7 +3058,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -3033,12 +3067,14 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3051,7 +3087,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -3071,7 +3107,7 @@
          <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:"
+   <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/metadata/location/url" -->
@@ -3086,16 +3122,18 @@
              _in-xml-name="url"
              _in-json-name="urls"
              gi="url"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='text']"
+   <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/metadata/location/link/text" -->
@@ -3115,16 +3153,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='name']"
+   <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" -->
@@ -3144,16 +3183,17 @@
          <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-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:[@key='name']"
+   <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>
+      <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:[@key='short-name']"
+   <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/metadata/party/short-name" -->
@@ -3173,12 +3213,13 @@
          <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='metadata']/j:array[@key='parties']/j:map/j:[@key='short-name']"
+   <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>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3208,7 +3249,7 @@
          <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:[@key='text']"
+   <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/metadata/party/link/text" -->
@@ -3228,16 +3269,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:"
+   <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/metadata/party/email-address" -->
@@ -3246,7 +3288,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -3255,12 +3297,14 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3273,7 +3317,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -3300,7 +3344,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/party/address"
                 _metaschema-json-id="/assembly/oscal-metadata/party/addresses"
                 name="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="addresses"
@@ -3317,7 +3361,7 @@
          <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:"
+   <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/metadata/party/address/addr-line" -->
@@ -3326,7 +3370,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -3335,16 +3379,18 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='city']"
+   <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/metadata/party/address/city" -->
@@ -3364,16 +3410,17 @@
          <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='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:[@key='city']"
+   <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>
+      <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:[@key='state']"
+   <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/metadata/party/address/state" -->
@@ -3393,16 +3440,17 @@
          <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-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:[@key='state']"
+   <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>
+      <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:[@key='postal-code']"
+   <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/metadata/party/address/postal-code" -->
@@ -3422,16 +3470,17 @@
          <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-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:[@key='postal-code']"
+   <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>
+      <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:[@key='country']"
+   <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/metadata/party/address/country" -->
@@ -3451,16 +3500,17 @@
          <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='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:[@key='country']"
+   <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>
+      <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:"
+   <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/metadata/party/member-of-organization" -->
@@ -3475,16 +3525,18 @@
              _in-xml-name="member-of-organization"
              _in-json-name="member-of-organizations"
              gi="member-of-organization"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -3504,12 +3556,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-parties']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3538,7 +3591,7 @@
          <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:[@key='title']"
+   <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" -->
@@ -3558,16 +3611,17 @@
          <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='components']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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/local-definitions/component/description" -->
@@ -3588,16 +3642,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='purpose']"
+   <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/local-definitions/component/purpose" -->
@@ -3617,16 +3672,17 @@
          <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='local-definitions']/j:array[@key='components']/j:map/j:[@key='purpose']"
+   <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>
+      <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:[@key='text']"
+   <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/local-definitions/component/link/text" -->
@@ -3646,12 +3702,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3676,7 +3733,7 @@
          <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:[@key='text']"
+   <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/local-definitions/component/responsible-role/link/text" -->
@@ -3696,16 +3753,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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/local-definitions/component/protocol/title" -->
@@ -3725,16 +3783,17 @@
          <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='components']/j:map/j:array[@key='protocols']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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/local-definitions/inventory-item/description" -->
@@ -3755,16 +3814,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/local-definitions/inventory-item/link/text" -->
@@ -3784,16 +3844,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/local-definitions/inventory-item/responsible-party/link/text" -->
@@ -3813,12 +3874,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3842,7 +3904,7 @@
          <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:[@key='text']"
+   <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/local-definitions/inventory-item/implemented-component/link/text" -->
@@ -3862,16 +3924,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/local-definitions/inventory-item/implemented-component/responsible-party/link/text" -->
@@ -3891,16 +3954,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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/local-definitions/user/title" -->
@@ -3920,16 +3984,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='short-name']"
+   <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" -->
@@ -3949,16 +4014,17 @@
          <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:[@key='short-name']"
+   <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>
+      <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:[@key='description']"
+   <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" -->
@@ -3979,16 +4045,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/local-definitions/user/link/text" -->
@@ -4008,16 +4075,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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/local-definitions/user/authorized-privilege/title" -->
@@ -4037,16 +4105,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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/local-definitions/user/authorized-privilege/description" -->
@@ -4067,16 +4136,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='description']"
+   <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/local-definitions/objectives-and-methods/description" -->
@@ -4097,16 +4167,17 @@
          <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='objectives-and-methods']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/local-definitions/objectives-and-methods/link/text" -->
@@ -4126,16 +4197,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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/local-definitions/objectives-and-methods//part/title" -->
@@ -4155,20 +4227,21 @@
          <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:[@key='title']"
+   <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>
+      <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"
-                 priority="8">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/objectives-and-methods//part" -->
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+   <!-- 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="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _key="prose"
              _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
              _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
@@ -4179,21 +4252,16 @@
              key="prose"
              _using-name="prose"
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+             _in-json-name="prose">
+         <value as-type="markup-multiline"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6/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"
-                 mode="get-value-property"
-                 priority="8">
-      <value>
-         <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:array[@key='links']/j:map/j:[@key='text']"
+   <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/local-definitions/objectives-and-methods//part/link/text" -->
@@ -4213,16 +4281,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='parts']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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/local-definitions/activity/title" -->
@@ -4242,16 +4311,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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/local-definitions/activity/description" -->
@@ -4272,16 +4342,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/local-definitions/activity/link/text" -->
@@ -4301,12 +4372,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -4333,7 +4405,7 @@
          <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:[@key='title']"
+   <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" -->
@@ -4353,16 +4425,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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/local-definitions/activity/step/description" -->
@@ -4383,16 +4456,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/local-definitions/activity/step/link/text" -->
@@ -4412,16 +4486,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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/local-definitions/activity/step/reviewed-controls/description" -->
@@ -4442,16 +4517,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/local-definitions/activity/step/reviewed-controls/link/text" -->
@@ -4471,12 +4547,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -4502,7 +4579,7 @@
          <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:[@key='description']"
+   <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/local-definitions/activity/step/reviewed-controls/control-selection/description" -->
@@ -4523,16 +4600,17 @@
          <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-selections']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/local-definitions/activity/step/reviewed-controls/control-selection/link/text" -->
@@ -4552,12 +4630,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -4588,7 +4667,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="include-control"
                 _key="include-controls"
@@ -4601,7 +4680,7 @@
          <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:"
+   <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/local-definitions/activity/step/reviewed-controls/control-selection/include-control/statement-id" -->
@@ -4616,12 +4695,14 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -4632,7 +4713,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/exclude-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/exclude-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="exclude-control"
                 _key="exclude-controls"
@@ -4645,7 +4726,7 @@
          <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:"
+   <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" -->
@@ -4660,12 +4741,14 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -4691,7 +4774,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -4712,16 +4795,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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-plan/local-definitions/activity/step/reviewed-controls/control-objective-selection/link/text" -->
@@ -4741,12 +4825,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -4770,7 +4855,7 @@
          </xsl:if>
       </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:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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-plan/local-definitions/activity/step/responsible-role/link/text" -->
@@ -4790,16 +4875,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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-plan/local-definitions/activity/related-controls/description" -->
@@ -4820,16 +4906,17 @@
          <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:map[@key='related-controls']/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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-plan/local-definitions/activity/related-controls/link/text" -->
@@ -4849,12 +4936,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:map[@key='related-controls']/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -4880,7 +4968,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -4901,16 +4989,17 @@
          <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:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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-plan/local-definitions/activity/related-controls/control-selection/link/text" -->
@@ -4930,12 +5019,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -4966,7 +5056,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="include-control"
                 _key="include-controls"
@@ -4979,7 +5069,7 @@
          <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:"
+   <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" -->
@@ -4994,12 +5084,14 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -5010,7 +5102,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/exclude-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/exclude-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="exclude-control"
                 _key="exclude-controls"
@@ -5023,7 +5115,7 @@
          <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:"
+   <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" -->
@@ -5038,12 +5130,14 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -5069,7 +5163,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -5090,16 +5184,17 @@
          <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:map[@key='related-controls']/j:array[@key='control-objective-selections']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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-plan/local-definitions/activity/related-controls/control-objective-selection/link/text" -->
@@ -5119,12 +5214,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:map[@key='related-controls']/j:array[@key='control-objective-selections']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -5148,7 +5244,7 @@
          </xsl:if>
       </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='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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-plan/local-definitions/activity/responsible-role/link/text" -->
@@ -5168,12 +5264,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -5197,7 +5294,7 @@
          <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:[@key='title']"
+   <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" -->
@@ -5217,20 +5314,21 @@
          <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='terms-and-conditions']//j:array[@key='parts']/j:map/j:[@key='title']"
+   <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>
+      <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']//j:array[@key='parts']/j:map"
-                 priority="6">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/terms-and-conditions//part" -->
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+   <!-- 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="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _key="prose"
              _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/p ul ol pre table h1 h2 h3 h4 h5 h6"
              _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/prose"
@@ -5241,21 +5339,16 @@
              key="prose"
              _using-name="prose"
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+             _in-json-name="prose">
+         <value as-type="markup-multiline"
+                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/p ul ol pre table h1 h2 h3 h4 h5 h6/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"
-                 mode="get-value-property"
-                 priority="6">
-      <value>
-         <xsl:value-of select="."/>
-      </value>
-   </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:[@key='text']"
+   <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-plan/terms-and-conditions//part/link/text" -->
@@ -5275,16 +5368,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='terms-and-conditions']//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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-plan/reviewed-controls/description" -->
@@ -5305,16 +5399,17 @@
          <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='reviewed-controls']/j:[@key='description']"
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:string[@key='description']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='text']"
+   <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-plan/reviewed-controls/link/text" -->
@@ -5334,12 +5429,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -5365,7 +5461,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -5386,16 +5482,17 @@
          <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='reviewed-controls']/j:array[@key='control-selections']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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-plan/reviewed-controls/control-selection/link/text" -->
@@ -5415,12 +5512,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='control-selections']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -5451,7 +5549,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="include-control"
                 _key="include-controls"
@@ -5464,7 +5562,7 @@
          <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:"
+   <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" -->
@@ -5479,12 +5577,14 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -5495,7 +5595,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/exclude-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/exclude-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="exclude-control"
                 _key="exclude-controls"
@@ -5508,7 +5608,7 @@
          <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:"
+   <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" -->
@@ -5523,12 +5623,14 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -5554,7 +5656,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -5575,16 +5677,17 @@
          <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='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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-plan/reviewed-controls/control-objective-selection/link/text" -->
@@ -5604,12 +5707,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='control-objective-selections']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -5633,7 +5737,7 @@
          </xsl:if>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:array[@key='assessment-subjects']/j:map/j:[@key='description']"
+   <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-plan/assessment-subject/description" -->
@@ -5654,16 +5758,17 @@
          <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='assessment-subjects']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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-plan/assessment-subject/link/text" -->
@@ -5683,12 +5788,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -5712,7 +5818,7 @@
          </xsl:if>
       </assembly>
    </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:[@key='text']"
+   <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-plan/assessment-subject/include-subject/link/text" -->
@@ -5732,16 +5838,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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-plan/assessment-subject/exclude-subject/link/text" -->
@@ -5761,16 +5868,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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-plan/assessment-assets/component/title" -->
@@ -5790,16 +5898,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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-plan/assessment-assets/component/description" -->
@@ -5820,16 +5929,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='purpose']"
+   <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-plan/assessment-assets/component/purpose" -->
@@ -5849,16 +5959,17 @@
          <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:[@key='purpose']"
+   <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>
+      <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:[@key='text']"
+   <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-plan/assessment-assets/component/link/text" -->
@@ -5878,12 +5989,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -5908,7 +6020,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -5928,16 +6040,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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-plan/assessment-assets/component/protocol/title" -->
@@ -5957,12 +6070,13 @@
          <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:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -5987,7 +6101,7 @@
          <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:[@key='title']"
+   <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-plan/assessment-assets/assessment-platform/title" -->
@@ -6007,16 +6121,17 @@
          <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='assessment-platforms']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='text']"
+   <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-plan/assessment-assets/assessment-platform/link/text" -->
@@ -6036,12 +6151,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -6065,7 +6181,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -6085,16 +6201,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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-plan/assessment-assets/assessment-platform/uses-component/responsible-party/link/text" -->
@@ -6114,16 +6231,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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-plan//task/title" -->
@@ -6143,16 +6261,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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" -->
@@ -6173,16 +6292,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -6202,12 +6322,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -6336,7 +6457,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -6356,16 +6477,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -6385,16 +6507,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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" -->
@@ -6415,16 +6538,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -6444,12 +6568,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -6473,7 +6598,7 @@
          </xsl:if>
       </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='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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" -->
@@ -6493,16 +6618,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -6522,16 +6648,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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" -->
@@ -6552,16 +6679,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -6581,12 +6709,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -6610,7 +6739,7 @@
          </xsl:if>
       </assembly>
    </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:[@key='text']"
+   <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" -->
@@ -6630,16 +6759,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -6659,16 +6789,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -6688,12 +6819,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -6721,7 +6853,7 @@
          <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:[@key='title']"
+   <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" -->
@@ -6741,16 +6873,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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" -->
@@ -6771,12 +6904,13 @@
          <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:[@key='description']"
+   <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>
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -6789,7 +6923,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -6831,7 +6965,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -6851,16 +6985,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -6880,12 +7015,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -6975,11 +7111,11 @@
       <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"/>
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 442e50220d..b7989aab98 100644
--- a/xml/convert/oscal_assessment-results_json-to-xml-converter.xsl
+++ b/xml/convert/oscal_assessment-results_json-to-xml-converter.xsl
@@ -78,7 +78,7 @@
                 _metaschema-json-id="/assembly/oscal-ar/assessment-results"
                 name="assessment-results"
                 key="assessment-results"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-results_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-results_metaschema.xml"
                 _key-name="oscal-ar:assessment-results"
                 _using-root-name="assessment-results"
                 gi="assessment-results">
@@ -103,7 +103,7 @@
                 _metaschema-json-id="/assembly/oscal-ar/assessment-results/metadata"
                 name="metadata"
                 key="metadata"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:metadata"
                 _step="metadata"
                 _key="metadata"
@@ -137,7 +137,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/revision/prop"
                 _metaschema-json-id="/assembly/oscal-metadata/revision/props"
                 name="property"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:property"
                 _step="prop"
                 _key="props"
@@ -160,7 +160,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/revision/link"
                 _metaschema-json-id="/assembly/oscal-metadata/revision/links"
                 name="link"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:link"
                 _step="link"
                 _key="links"
@@ -181,7 +181,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/role"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/roles"
                 name="role"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:role"
                 _step="role"
                 _key="roles"
@@ -205,7 +205,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/location"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/locations"
                 name="location"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:location"
                 _step="location"
                 _key="locations"
@@ -231,7 +231,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/party"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/parties"
                 name="party"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:party"
                 _step="party"
                 _key="parties"
@@ -261,7 +261,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/responsible-party"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/responsible-parties"
                 name="responsible-party"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:responsible-party"
                 _step="responsible-party"
                 _key="responsible-parties"
@@ -284,7 +284,7 @@
                 _metaschema-json-id="/assembly/oscal-ar/assessment-results/import-ap"
                 name="import-ap"
                 key="import-ap"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-results_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-results_metaschema.xml"
                 _key-name="oscal-ar:import-ap"
                 _step="import-ap"
                 _key="import-ap"
@@ -306,7 +306,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ar/assessment-results/local-definitions/objectives-and-methods"
                 _metaschema-json-id="/assembly/oscal-ar/assessment-results/local-definitions/objectives-and-methods"
                 name="local-objective"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:local-objective"
                 _step="objectives-and-methods"
                 _key="objectives-and-methods"
@@ -329,7 +329,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/local-objective/part"
                 _metaschema-json-id="/assembly/oscal-assessment-common/local-objective/parts"
                 name="part"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
                 _key-name="oscal-catalog-common:part"
                 _step="part"
                 _key="parts"
@@ -355,7 +355,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ar/result/attestation/part"
                 _metaschema-json-id="/assembly/oscal-ar/result/attestations/parts"
                 name="assessment-part"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:assessment-part"
                 _step="part"
                 _key="parts"
@@ -381,7 +381,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ar/assessment-results/local-definitions/activity"
                 _metaschema-json-id="/assembly/oscal-ar/assessment-results/local-definitions/activities"
                 name="activity"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:activity"
                 _step="activity"
                 _key="activities"
@@ -408,7 +408,7 @@
                 _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps/reviewed-controls"
                 name="reviewed-controls"
                 key="reviewed-controls"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:reviewed-controls"
                 _step="reviewed-controls"
                 _key="reviewed-controls"
@@ -435,7 +435,7 @@
                 _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/include-objective"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/include-objectives"
                 name="select-objective-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-objective-by-id"
                 _step="include-objective"
                 _key="include-objectives"
@@ -454,7 +454,7 @@
                 _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/exclude-objective"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/exclude-objectives"
                 name="select-objective-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-objective-by-id"
                 _step="exclude-objective"
                 _key="exclude-objectives"
@@ -472,7 +472,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/activity/step/responsible-role"
                 _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps/responsible-roles"
                 name="responsible-role"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:responsible-role"
                 _step="responsible-role"
                 _key="responsible-roles"
@@ -495,7 +495,7 @@
                 _metaschema-json-id="/assembly/oscal-assessment-common/activity/related-controls"
                 name="reviewed-controls"
                 key="related-controls"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:reviewed-controls"
                 _step="related-controls"
                 _key="related-controls"
@@ -521,7 +521,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ar/assessment-results/result"
                 _metaschema-json-id="/assembly/oscal-ar/assessment-results/results"
                 name="result"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-results_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-results_metaschema.xml"
                 _key-name="oscal-ar:result"
                 _step="result"
                 _key="results"
@@ -553,7 +553,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ar/result/local-definitions/component"
                 _metaschema-json-id="/assembly/oscal-ar/result/local-definitions/components"
                 name="system-component"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:system-component"
                 _step="component"
                 _key="components"
@@ -581,7 +581,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/protocol"
                 _metaschema-json-id="/assembly/oscal-implementation-common/system-component/protocols"
                 name="protocol"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:protocol"
                 _step="protocol"
                 _key="protocols"
@@ -603,7 +603,7 @@
                 _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/port-range"
                 _metaschema-json-id="/assembly/oscal-implementation-common/protocol/port-ranges"
                 name="port-range"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:port-range"
                 _step="port-range"
                 _key="port-ranges"
@@ -623,7 +623,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ar/result/local-definitions/inventory-item"
                 _metaschema-json-id="/assembly/oscal-ar/result/local-definitions/inventory-items"
                 name="inventory-item"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:inventory-item"
                 _step="inventory-item"
                 _key="inventory-items"
@@ -647,7 +647,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ar/result/local-definitions/user"
                 _metaschema-json-id="/assembly/oscal-ar/result/local-definitions/users"
                 name="system-user"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:system-user"
                 _step="user"
                 _key="users"
@@ -673,7 +673,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/authorized-privilege"
                 _metaschema-json-id="/assembly/oscal-implementation-common/system-user/authorized-privileges"
                 name="authorized-privilege"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:authorized-privilege"
                 _step="authorized-privilege"
                 _key="authorized-privileges"
@@ -694,7 +694,7 @@
                 _metaschema-json-id="/assembly/oscal-ar/result/local-definitions/assessment-assets"
                 name="assessment-assets"
                 key="assessment-assets"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:assessment-assets"
                 _step="assessment-assets"
                 _key="assessment-assets"
@@ -716,7 +716,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ar/result/local-definitions/assessment-task"
                 _metaschema-json-id="/assembly/oscal-ar/result/local-definitions/tasks"
                 name="task"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:task"
                 _step="assessment-task"
                 _key="tasks"
@@ -747,7 +747,7 @@
                 _metaschema-xml-id="/assembly/oscal-assessment-common/task/task"
                 _metaschema-json-id="/assembly/oscal-assessment-common/task/tasks"
                 name="task"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:task"
                 _step="task"
                 _key="tasks"
@@ -779,7 +779,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/task/associated-activity/subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/task/associated-activities/subjects"
                 name="assessment-subject"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:assessment-subject"
                 _step="subject"
                 _key="subjects"
@@ -804,7 +804,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-subjects"
                 name="select-subject-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-subject-by-id"
                 _step="include-subject"
                 _key="include-subjects"
@@ -826,7 +826,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/exclude-subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/exclude-subjects"
                 name="select-subject-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-subject-by-id"
                 _step="exclude-subject"
                 _key="exclude-subjects"
@@ -849,7 +849,7 @@
                 _metaschema-xml-id="/assembly/oscal-ar/result/assessment-log/entry/logged-by"
                 _metaschema-json-id="/assembly/oscal-ar/result/assessment-log/entries/logged-by"
                 name="logged-by"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:logged-by"
                 _step="logged-by"
                 _key="logged-by"
@@ -868,7 +868,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ar/result/assessment-log/entry/related-task"
                 _metaschema-json-id="/assembly/oscal-ar/result/assessment-log/entries/related-tasks"
                 name="related-task"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:related-task"
                 _step="related-task"
                 _key="related-tasks"
@@ -892,7 +892,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ar/result/observation"
                 _metaschema-json-id="/assembly/oscal-ar/result/observations"
                 name="observation"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:observation"
                 _step="observation"
                 _key="observations"
@@ -922,7 +922,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/observation/origin"
                 _metaschema-json-id="/assembly/oscal-assessment-common/observation/origins"
                 name="origin"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:origin"
                 _step="origin"
                 _key="origins"
@@ -944,7 +944,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/origin/actor"
                 _metaschema-json-id="/assembly/oscal-assessment-common/origin/actors"
                 name="origin-actor"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:origin-actor"
                 _step="actor"
                 _key="actors"
@@ -966,7 +966,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ar/result/risk"
                 _metaschema-json-id="/assembly/oscal-ar/result/risks"
                 name="risk"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:risk"
                 _step="risk"
                 _key="risks"
@@ -998,7 +998,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/risk/characterization"
                 _metaschema-json-id="/assembly/oscal-assessment-common/risk/characterizations"
                 name="characterization"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:characterization"
                 _step="characterization"
                 _key="characterizations"
@@ -1019,7 +1019,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ar/result/finding"
                 _metaschema-json-id="/assembly/oscal-ar/result/findings"
                 name="finding"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-results_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-results_metaschema.xml"
                 _key-name="oscal-ar:finding"
                 _step="finding"
                 _key="findings"
@@ -1048,7 +1048,7 @@
                 _metaschema-json-id="/assembly/oscal-ar/finding/target"
                 name="finding-target"
                 key="target"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:finding-target"
                 _step="target"
                 _key="target"
@@ -1067,7 +1067,6 @@
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
          <xsl:apply-templates select="*[@key='status']"/>
-         <xsl:apply-templates select="*[@key='reason']"/>
          <xsl:apply-templates select="*[@key='implementation-status']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
@@ -1079,7 +1078,7 @@
                 _metaschema-json-id="/assembly/oscal-assessment-common/finding-target/implementation-status"
                 name="implementation-status"
                 key="implementation-status"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:implementation-status"
                 _step="implementation-status"
                 _key="implementation-status"
@@ -1102,7 +1101,7 @@
                 _metaschema-json-id="/assembly/oscal-ar/assessment-results/back-matter"
                 name="back-matter"
                 key="back-matter"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:back-matter"
                 _step="back-matter"
                 _key="back-matter"
@@ -1117,7 +1116,7 @@
          <xsl:apply-templates select="*[@key='resources']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:[@key='remarks']">
+   <xsl:template match="j:string[@key='remarks']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="remarks" -->
       <field _metaschema-xml-id="/assembly/oscal-metadata/property/remarks"
@@ -1127,7 +1126,7 @@
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:remarks"
              _step="remarks"
              _key="remarks"
@@ -1140,14 +1139,17 @@
          <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:[@key='remarks']" mode="get-value-property" priority="8">
-      <value>
+   <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:">
+   <xsl:template match="j:array[@key='location-uuids']/j:string">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="location-uuid" -->
       <field _metaschema-xml-id="/assembly/oscal-metadata/party/location-uuid"
@@ -1155,7 +1157,7 @@
              collapsible="no"
              as-type="uuid"
              name="location-uuid"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:location-uuid"
              _step="location-uuid"
              _key="location-uuids"
@@ -1164,16 +1166,18 @@
              _in-xml-name="location-uuid"
              _in-json-name="location-uuids"
              gi="location-uuid"
-             in-json="SCALAR"/>
+             in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="j:array[@key='location-uuids']/j:"
+   <xsl:template match="j:array[@key='location-uuids']/j:string"
                  mode="get-value-property"
                  priority="8">
-      <value>
+      <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="(j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:string[@key='party-uuid'] | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:string[@key='party-uuid'] | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j:)">
+   <xsl:template match="(j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:string[@key='party-uuid'] | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:string[@key='party-uuid'] | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string)">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="party-uuid" -->
       <field _metaschema-xml-id="/assembly/oscal-metadata/responsible-party/party-uuid"
@@ -1181,7 +1185,7 @@
              collapsible="no"
              as-type="uuid"
              name="party-uuid"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:party-uuid"
              _step="party-uuid"
              _key="party-uuids"
@@ -1190,16 +1194,18 @@
              _in-xml-name="party-uuid"
              _in-json-name="party-uuids"
              gi="party-uuid"
-             in-json="SCALAR"/>
+             in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="(j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:string[@key='party-uuid'] | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:string[@key='party-uuid'] | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j:)"
+   <xsl:template match="(j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:string[@key='party-uuid'] | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:string[@key='party-uuid'] | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string)"
                  mode="get-value-property"
                  priority="7">
-      <value>
+      <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="(j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:array[@key='role-ids']/j: | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'])">
+   <xsl:template match="(j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:array[@key='role-ids']/j:string | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'])">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="role-id" -->
       <field _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/role-id"
@@ -1207,7 +1213,7 @@
              collapsible="no"
              as-type="token"
              name="role-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:role-id"
              _step="role-id"
              _key="role-ids"
@@ -1216,16 +1222,18 @@
              _in-xml-name="role-id"
              _in-json-name="role-ids"
              gi="role-id"
-             in-json="SCALAR"/>
+             in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="(j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:array[@key='role-ids']/j: | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'])"
+   <xsl:template match="(j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:array[@key='role-ids']/j:string | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'])"
                  mode="get-value-property"
                  priority="9">
-      <value>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:array[@key='functions-performed']/j:">
+   <xsl:template match="j:array[@key='functions-performed']/j:string">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="function-performed" -->
       <field _metaschema-xml-id="/assembly/oscal-implementation-common/authorized-privilege/function-performed"
@@ -1233,7 +1241,7 @@
              collapsible="no"
              as-type="string"
              name="function-performed"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
              _key-name="oscal-implementation-common:function-performed"
              _step="function-performed"
              _key="functions-performed"
@@ -1242,12 +1250,14 @@
              _in-xml-name="function-performed"
              _in-json-name="functions-performed"
              gi="function-performed"
-             in-json="SCALAR"/>
+             in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="j:array[@key='functions-performed']/j:"
+   <xsl:template match="j:array[@key='functions-performed']/j:string"
                  mode="get-value-property"
                  priority="11">
-      <value>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -1259,7 +1269,7 @@
              collapsible="no"
              as-type="uri"
              name="threat-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
              _key-name="oscal-assessment-common:threat-id"
              _step="threat-id"
              _key="threat-ids"
@@ -1279,7 +1289,7 @@
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
-   <xsl:template match="j:[@key='status-change']">
+   <xsl:template match="j:string[@key='status-change']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="status-change" -->
       <field _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/status-change"
@@ -1288,7 +1298,7 @@
              as-type="token"
              name="risk-status"
              key="status-change"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
              _key-name="oscal-assessment-common:risk-status"
              _step="status-change"
              _key="status-change"
@@ -1301,12 +1311,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status-change</xsl:attribute>
          </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:[@key='status-change']"
+   <xsl:template match="j:string[@key='status-change']"
                  mode="get-value-property"
                  priority="10">
-      <value>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -1318,7 +1329,7 @@
              collapsible="no"
              as-type="string"
              name="hash"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:hash"
              _step="hash"
              _key="hashes"
@@ -1496,7 +1507,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/link/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -1576,7 +1587,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/address/type"
             name="location-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:location-type"
             _step="type"
             _key="type"
@@ -1714,7 +1725,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/local-objective/control-id"
             name="control-id"
             key="control-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
             _key-name="oscal-catalog-common:control-id"
             _step="control-id"
             _key="control-id"
@@ -1851,7 +1862,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/control-id"
             name="control-id"
             key="control-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
             _key-name="oscal-catalog-common:control-id"
             _step="control-id"
             _key="control-id"
@@ -1873,7 +1884,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/select-objective-by-id/objective-id"
             name="objective-id"
             key="objective-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
             _key-name="oscal-assessment-common:objective-id"
             _step="objective-id"
             _key="objective-id"
@@ -1952,7 +1963,7 @@
             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/type"
             name="system-component-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
             _key-name="oscal-implementation-common:system-component-type"
             _step="type"
             _key="type"
@@ -2384,7 +2395,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/select-subject-by-id/subject-uuid"
             name="subject-uuid"
             key="subject-uuid"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
             _key-name="oscal-assessment-common:subject-uuid"
             _step="subject-uuid"
             _key="subject-uuid"
@@ -2406,7 +2417,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/select-subject-by-id/type"
             name="subject-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
             _key-name="oscal-assessment-common:subject-type"
             _step="type"
             _key="type"
@@ -2677,7 +2688,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/subject-reference/subject-uuid"
             name="subject-uuid"
             key="subject-uuid"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
             _key-name="oscal-assessment-common:subject-uuid"
             _step="subject-uuid"
             _key="subject-uuid"
@@ -2699,7 +2710,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/subject-reference/type"
             name="subject-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
             _key-name="oscal-assessment-common:subject-type"
             _step="type"
             _key="type"
@@ -3068,6 +3079,46 @@
    <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" -->
+      <flag in-json="string"
+            as-type="token"
+            _step="state"
+            _key="state"
+            _metaschema-xml-id="/assembly/oscal-assessment-common/finding-target/status/state"
+            _metaschema-json-id="/assembly/oscal-assessment-common/finding-target/status/state"
+            name="state"
+            key="state"
+            _using-name="state"
+            _in-xml-name="state"
+            _in-json-name="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" -->
+      <flag in-json="string"
+            as-type="token"
+            _step="reason"
+            _key="reason"
+            _metaschema-xml-id="/assembly/oscal-assessment-common/finding-target/status/reason"
+            _metaschema-json-id="/assembly/oscal-assessment-common/finding-target/status/reason"
+            name="reason"
+            key="reason"
+            _using-name="reason"
+            _in-xml-name="reason"
+            _in-json-name="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='implementation-status']/j:string[@key='state']"><!-- XML match="implementation-status/@state" -->
       <flag in-json="string"
             as-type="token"
@@ -3174,7 +3225,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -3235,7 +3286,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -3250,7 +3301,7 @@
    <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>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:[@key='title']"
+   <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" -->
@@ -3270,16 +3321,17 @@
          <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:[@key='title']"
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:string[@key='title']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='published']"
+   <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" -->
@@ -3289,7 +3341,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -3302,16 +3354,17 @@
          <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:[@key='published']"
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:string[@key='published']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='last-modified']"
+   <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" -->
@@ -3321,7 +3374,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -3334,16 +3387,17 @@
          <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:[@key='last-modified']"
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:string[@key='last-modified']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='version']"
+   <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" -->
@@ -3353,7 +3407,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -3366,16 +3420,17 @@
          <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:[@key='version']"
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:string[@key='version']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='oscal-version']"
+   <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" -->
@@ -3385,7 +3440,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -3398,12 +3453,13 @@
          <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:[@key='oscal-version']"
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:string[@key='oscal-version']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3414,7 +3470,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/revisions/revision"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/revisions"
                 name="revision"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:revision"
                 _step="revisions/revision"
                 _key="revisions"
@@ -3442,7 +3498,7 @@
              group-json="ARRAY"
              name="revision"
              key="revisions"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:revision"
              _key-ref="oscal-metadata:revision">
          <xsl:if test="$with-key">
@@ -3451,7 +3507,7 @@
          <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:[@key='title']"
+   <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" -->
@@ -3471,16 +3527,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='published']"
+   <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" -->
@@ -3490,7 +3547,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -3503,16 +3560,17 @@
          <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:[@key='published']"
+   <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>
+      <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:[@key='last-modified']"
+   <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" -->
@@ -3522,7 +3580,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -3535,16 +3593,17 @@
          <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:[@key='last-modified']"
+   <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>
+      <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:[@key='version']"
+   <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" -->
@@ -3554,7 +3613,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -3567,16 +3626,17 @@
          <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:[@key='version']"
+   <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>
+      <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:[@key='oscal-version']"
+   <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" -->
@@ -3586,7 +3646,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -3599,16 +3659,17 @@
          <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:[@key='oscal-version']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -3628,12 +3689,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3646,7 +3708,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -3666,7 +3728,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -3686,16 +3748,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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" -->
@@ -3715,16 +3778,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='short-name']"
+   <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" -->
@@ -3744,16 +3808,17 @@
          <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:[@key='short-name']"
+   <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>
+      <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:[@key='description']"
+   <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" -->
@@ -3774,16 +3839,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -3803,16 +3869,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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" -->
@@ -3832,12 +3899,13 @@
          <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:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3849,7 +3917,7 @@
                 _metaschema-json-id="/assembly/oscal-metadata/location/address"
                 name="address"
                 key="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="address"
@@ -3869,7 +3937,7 @@
          <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:"
+   <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" -->
@@ -3878,7 +3946,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -3887,16 +3955,18 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='city']"
+   <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" -->
@@ -3916,16 +3986,17 @@
          <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:[@key='city']"
+   <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>
+      <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:[@key='state']"
+   <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" -->
@@ -3945,16 +4016,17 @@
          <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:[@key='state']"
+   <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>
+      <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:[@key='postal-code']"
+   <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" -->
@@ -3974,16 +4046,17 @@
          <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:[@key='postal-code']"
+   <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>
+      <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:[@key='country']"
+   <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" -->
@@ -4003,16 +4076,17 @@
          <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:[@key='country']"
+   <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>
+      <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:"
+   <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" -->
@@ -4021,7 +4095,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -4030,12 +4104,14 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -4048,7 +4124,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -4068,7 +4144,7 @@
          <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:"
+   <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" -->
@@ -4083,16 +4159,18 @@
              _in-xml-name="url"
              _in-json-name="urls"
              gi="url"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -4112,16 +4190,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='name']"
+   <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" -->
@@ -4141,16 +4220,17 @@
          <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:[@key='name']"
+   <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>
+      <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:[@key='short-name']"
+   <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" -->
@@ -4170,12 +4250,13 @@
          <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:[@key='short-name']"
+   <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>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -4205,7 +4286,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -4225,16 +4306,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:"
+   <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" -->
@@ -4243,7 +4325,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -4252,12 +4334,14 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -4270,7 +4354,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -4297,7 +4381,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/party/address"
                 _metaschema-json-id="/assembly/oscal-metadata/party/addresses"
                 name="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="addresses"
@@ -4314,7 +4398,7 @@
          <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:"
+   <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" -->
@@ -4323,7 +4407,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -4332,16 +4416,18 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='city']"
+   <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" -->
@@ -4361,16 +4447,17 @@
          <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:[@key='city']"
+   <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>
+      <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:[@key='state']"
+   <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" -->
@@ -4390,16 +4477,17 @@
          <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:[@key='state']"
+   <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>
+      <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:[@key='postal-code']"
+   <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" -->
@@ -4419,16 +4507,17 @@
          <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:[@key='postal-code']"
+   <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>
+      <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:[@key='country']"
+   <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" -->
@@ -4448,16 +4537,17 @@
          <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:[@key='country']"
+   <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>
+      <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:"
+   <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" -->
@@ -4472,16 +4562,18 @@
              _in-xml-name="member-of-organization"
              _in-json-name="member-of-organizations"
              gi="member-of-organization"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -4501,12 +4593,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -4532,7 +4625,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -4553,16 +4646,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -4582,16 +4676,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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" -->
@@ -4611,20 +4706,21 @@
          <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:[@key='title']"
+   <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>
+      <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"
-                 priority="8">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/local-definitions/objectives-and-methods//part" -->
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+   <!-- 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="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _key="prose"
              _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
              _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
@@ -4635,21 +4731,16 @@
              key="prose"
              _using-name="prose"
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+             _in-json-name="prose">
+         <value as-type="markup-multiline"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6/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"
-                 mode="get-value-property"
-                 priority="8">
-      <value>
-         <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:array[@key='links']/j:map/j:[@key='text']"
+   <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" -->
@@ -4669,16 +4760,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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" -->
@@ -4698,16 +4790,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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" -->
@@ -4728,16 +4821,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -4757,12 +4851,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -4789,7 +4884,7 @@
          <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:[@key='title']"
+   <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" -->
@@ -4809,16 +4904,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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" -->
@@ -4839,16 +4935,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -4868,16 +4965,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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" -->
@@ -4898,16 +4996,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -4927,12 +5026,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -4958,7 +5058,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -4979,16 +5079,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/local-definitions/activity/step/reviewed-controls/control-selection/link/text" -->
@@ -5008,12 +5109,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -5044,7 +5146,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="include-control"
                 _key="include-controls"
@@ -5057,7 +5159,7 @@
          <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:"
+   <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" -->
@@ -5072,12 +5174,14 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -5088,7 +5192,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/exclude-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/exclude-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="exclude-control"
                 _key="exclude-controls"
@@ -5101,7 +5205,7 @@
          <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:"
+   <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" -->
@@ -5116,12 +5220,14 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -5147,7 +5253,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -5168,16 +5274,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -5197,12 +5304,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -5226,7 +5334,7 @@
          </xsl:if>
       </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:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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" -->
@@ -5246,16 +5354,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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" -->
@@ -5276,16 +5385,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -5305,12 +5415,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -5336,7 +5447,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -5357,16 +5468,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -5386,12 +5498,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -5422,7 +5535,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="include-control"
                 _key="include-controls"
@@ -5435,7 +5548,7 @@
          <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:"
+   <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" -->
@@ -5450,12 +5563,14 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -5466,7 +5581,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/exclude-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/exclude-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="exclude-control"
                 _key="exclude-controls"
@@ -5479,7 +5594,7 @@
          <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:"
+   <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" -->
@@ -5494,12 +5609,14 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -5525,7 +5642,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -5546,16 +5663,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/activity/related-controls/control-objective-selection/link/text" -->
@@ -5575,12 +5693,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -5604,7 +5723,7 @@
          </xsl:if>
       </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='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/activity/responsible-role/link/text" -->
@@ -5624,16 +5743,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:[@key='title']"
+   <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/result/title" -->
@@ -5653,16 +5773,17 @@
          <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:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:[@key='description']"
+   <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/result/description" -->
@@ -5683,16 +5804,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='start']"
+   <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/result/start" -->
@@ -5712,16 +5834,17 @@
          <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:[@key='start']"
+   <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>
+      <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:[@key='end']"
+   <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/result/end" -->
@@ -5741,16 +5864,17 @@
          <xsl:if test="$with-key">
             <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:[@key='end']"
+   <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>
+      <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:[@key='text']"
+   <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/result/link/text" -->
@@ -5770,12 +5894,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -5803,7 +5928,7 @@
          <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:[@key='title']"
+   <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/result/local-definitions/component/title" -->
@@ -5823,16 +5948,17 @@
          <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:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='description']"
+   <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/result/local-definitions/component/description" -->
@@ -5853,16 +5979,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='purpose']"
+   <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/result/local-definitions/component/purpose" -->
@@ -5882,16 +6009,17 @@
          <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:array[@key='components']/j:map/j:[@key='purpose']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='text']"
+   <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/result/local-definitions/component/link/text" -->
@@ -5911,12 +6039,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -5941,7 +6070,7 @@
          <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:[@key='text']"
+   <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/result/local-definitions/component/responsible-role/link/text" -->
@@ -5961,16 +6090,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='title']"
+   <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/result/local-definitions/component/protocol/title" -->
@@ -5990,16 +6120,17 @@
          <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:array[@key='protocols']/j:map/j:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='description']"
+   <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/result/local-definitions/inventory-item/description" -->
@@ -6020,16 +6151,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/result/local-definitions/inventory-item/link/text" -->
@@ -6049,16 +6181,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='text']"
+   <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/result/local-definitions/inventory-item/responsible-party/link/text" -->
@@ -6078,12 +6211,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -6107,7 +6241,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -6127,16 +6261,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='text']"
+   <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/result/local-definitions/inventory-item/implemented-component/responsible-party/link/text" -->
@@ -6156,16 +6291,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-parties']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='title']"
+   <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/result/local-definitions/user/title" -->
@@ -6185,16 +6321,17 @@
          <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='users']/j:map/j:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='short-name']"
+   <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/result/local-definitions/user/short-name" -->
@@ -6214,16 +6351,17 @@
          <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:[@key='short-name']"
+   <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>
+      <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:[@key='description']"
+   <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" -->
@@ -6244,16 +6382,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/result/local-definitions/user/link/text" -->
@@ -6273,16 +6412,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='title']"
+   <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/result/local-definitions/user/authorized-privilege/title" -->
@@ -6302,16 +6442,17 @@
          <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='users']/j:map/j:array[@key='authorized-privileges']/j:map/j:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='description']"
+   <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/result/local-definitions/user/authorized-privilege/description" -->
@@ -6332,16 +6473,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='title']"
+   <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/result/local-definitions/assessment-assets/component/title" -->
@@ -6361,16 +6503,17 @@
          <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:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='description']"
+   <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/result/local-definitions/assessment-assets/component/description" -->
@@ -6391,16 +6534,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='purpose']"
+   <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/result/local-definitions/assessment-assets/component/purpose" -->
@@ -6420,16 +6564,17 @@
          <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:[@key='purpose']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='text']"
+   <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" -->
@@ -6449,12 +6594,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -6479,7 +6625,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -6499,16 +6645,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='title']"
+   <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/local-definitions/assessment-assets/component/protocol/title" -->
@@ -6528,12 +6675,13 @@
          <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:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -6558,7 +6706,7 @@
          <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:[@key='title']"
+   <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" -->
@@ -6578,16 +6726,17 @@
          <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:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='text']"
+   <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/local-definitions/assessment-assets/assessment-platform/link/text" -->
@@ -6607,12 +6756,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -6636,7 +6786,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -6656,16 +6806,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='text']"
+   <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/local-definitions/assessment-assets/assessment-platform/uses-component/responsible-party/link/text" -->
@@ -6685,16 +6836,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='title']"
+   <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//assessment-task/title" -->
@@ -6714,16 +6866,17 @@
          <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:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='description']"
+   <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//assessment-task/description" -->
@@ -6744,16 +6897,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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//assessment-task/link/text" -->
@@ -6773,12 +6927,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -6907,7 +7062,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -6927,16 +7082,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='text']"
+   <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//assessment-task/associated-activity/responsible-role/link/text" -->
@@ -6956,16 +7112,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='description']"
+   <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//assessment-task/associated-activity/subject/description" -->
@@ -6986,16 +7143,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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//assessment-task/associated-activity/subject/link/text" -->
@@ -7015,12 +7173,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -7044,7 +7203,7 @@
          </xsl:if>
       </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='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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//assessment-task/associated-activity/subject/include-subject/link/text" -->
@@ -7064,16 +7223,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='text']"
+   <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//assessment-task/associated-activity/subject/exclude-subject/link/text" -->
@@ -7093,16 +7253,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='description']"
+   <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//assessment-task/subject/description" -->
@@ -7123,16 +7284,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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//assessment-task/subject/link/text" -->
@@ -7152,12 +7314,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -7181,7 +7344,7 @@
          </xsl:if>
       </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='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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//assessment-task/subject/include-subject/link/text" -->
@@ -7201,16 +7364,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='text']"
+   <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//assessment-task/subject/exclude-subject/link/text" -->
@@ -7230,16 +7394,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='text']"
+   <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//assessment-task/responsible-role/link/text" -->
@@ -7259,16 +7424,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='description']"
+   <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/reviewed-controls/description" -->
@@ -7289,16 +7455,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/reviewed-controls/link/text" -->
@@ -7318,12 +7485,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -7349,7 +7517,7 @@
          <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-selections']/j:map/j:[@key='description']"
+   <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/reviewed-controls/control-selection/description" -->
@@ -7370,16 +7538,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/reviewed-controls/control-selection/link/text" -->
@@ -7399,12 +7568,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -7435,7 +7605,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="include-control"
                 _key="include-controls"
@@ -7448,7 +7618,7 @@
          <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='include-controls']/j:map/j:array[@key='statement-ids']/j:"
+   <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/reviewed-controls/control-selection/include-control/statement-id" -->
@@ -7463,12 +7633,14 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -7479,7 +7651,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/exclude-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/exclude-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="exclude-control"
                 _key="exclude-controls"
@@ -7492,7 +7664,7 @@
          <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:"
+   <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" -->
@@ -7507,12 +7679,14 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -7538,7 +7712,7 @@
          <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:[@key='description']"
+   <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/reviewed-controls/control-objective-selection/description" -->
@@ -7559,16 +7733,17 @@
          <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-objective-selections']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/reviewed-controls/control-objective-selection/link/text" -->
@@ -7588,12 +7763,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -7634,7 +7810,7 @@
          <xsl:apply-templates select="*[@key='parts']"/>
       </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:[@key='text']"
+   <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/attestation/responsible-party/link/text" -->
@@ -7654,16 +7830,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='title']"
+   <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/attestation//part/title" -->
@@ -7683,20 +7860,21 @@
          <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:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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"
-                 priority="9">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/attestation//part" -->
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+   <!-- 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="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _key="prose"
              _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/p ul ol pre table h1 h2 h3 h4 h5 h6"
              _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/prose"
@@ -7707,21 +7885,16 @@
              key="prose"
              _using-name="prose"
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+             _in-json-name="prose">
+         <value as-type="markup-multiline"
+                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/p ul ol pre table h1 h2 h3 h4 h5 h6/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"
-                 mode="get-value-property"
-                 priority="9">
-      <value>
-         <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:array[@key='links']/j:map/j:[@key='text']"
+   <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" -->
@@ -7741,12 +7914,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -7795,7 +7969,7 @@
          <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:[@key='title']"
+   <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" -->
@@ -7815,16 +7989,17 @@
          <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:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='description']"
+   <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/assessment-log/entry/description" -->
@@ -7845,16 +8020,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='start']"
+   <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/assessment-log/entry/start" -->
@@ -7874,16 +8050,17 @@
          <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:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:[@key='start']"
+   <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>
+      <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:[@key='end']"
+   <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/assessment-log/entry/end" -->
@@ -7903,16 +8080,17 @@
          <xsl:if test="$with-key">
             <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:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:[@key='end']"
+   <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>
+      <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:[@key='text']"
+   <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/assessment-log/entry/link/text" -->
@@ -7932,16 +8110,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='text']"
+   <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/assessment-log/entry/related-task/link/text" -->
@@ -7961,16 +8140,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='text']"
+   <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/assessment-log/entry/related-task/responsible-party/link/text" -->
@@ -7990,16 +8170,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-parties']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='description']"
+   <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/assessment-log/entry/related-task/subject/description" -->
@@ -8020,16 +8201,17 @@
          <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:array[@key='subjects']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/assessment-log/entry/related-task/subject/link/text" -->
@@ -8049,12 +8231,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -8078,7 +8261,7 @@
          </xsl:if>
       </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:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/assessment-log/entry/related-task/subject/include-subject/link/text" -->
@@ -8098,16 +8281,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='text']"
+   <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/assessment-log/entry/related-task/subject/exclude-subject/link/text" -->
@@ -8127,12 +8311,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -8157,7 +8342,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -8178,16 +8363,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/assessment-log/entry/related-task/identified-subject/subject/link/text" -->
@@ -8207,12 +8393,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -8236,7 +8423,7 @@
          </xsl:if>
       </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:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/assessment-log/entry/related-task/identified-subject/subject/include-subject/link/text" -->
@@ -8256,16 +8443,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='text']"
+   <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/assessment-log/entry/related-task/identified-subject/subject/exclude-subject/link/text" -->
@@ -8285,16 +8473,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='title']"
+   <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/observation/title" -->
@@ -8314,16 +8503,17 @@
          <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:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='description']"
+   <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/observation/description" -->
@@ -8344,16 +8534,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/observation/link/text" -->
@@ -8373,16 +8564,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:"
+   <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/observation/method" -->
@@ -8397,16 +8589,18 @@
              _in-xml-name="method"
              _in-json-name="methods"
              gi="method"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:"
+   <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/observation/type" -->
@@ -8421,16 +8615,18 @@
              _in-xml-name="type"
              _in-json-name="types"
              gi="type"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='text']"
+   <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/observation/origin/actor/link/text" -->
@@ -8450,16 +8646,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/observation/origin/related-task/link/text" -->
@@ -8479,16 +8676,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/observation/origin/related-task/responsible-party/link/text" -->
@@ -8508,16 +8706,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='description']"
+   <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/observation/origin/related-task/subject/description" -->
@@ -8538,16 +8737,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/observation/origin/related-task/subject/link/text" -->
@@ -8567,12 +8767,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -8596,7 +8797,7 @@
          </xsl:if>
       </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:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/observation/origin/related-task/subject/include-subject/link/text" -->
@@ -8616,16 +8817,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/observation/origin/related-task/subject/exclude-subject/link/text" -->
@@ -8645,12 +8847,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -8675,7 +8878,7 @@
          <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:[@key='description']"
+   <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/observation/origin/related-task/identified-subject/subject/description" -->
@@ -8696,16 +8899,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -8725,12 +8929,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -8754,7 +8959,7 @@
          </xsl:if>
       </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:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/observation/origin/related-task/identified-subject/subject/include-subject/link/text" -->
@@ -8774,16 +8979,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/observation/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
@@ -8803,12 +9009,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -8819,7 +9026,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/observation/subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/observation/subjects"
                 name="subject-reference"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:subject-reference"
                 _step="subject"
                 _key="subjects"
@@ -8836,7 +9043,7 @@
          <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:[@key='title']"
+   <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/observation/subject/title" -->
@@ -8856,16 +9063,17 @@
          <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:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/observation/subject/link/text" -->
@@ -8885,12 +9093,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -8914,7 +9123,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -8935,16 +9144,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/observation/relevant-evidence/link/text" -->
@@ -8964,16 +9174,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='collected']"
+   <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/observation/collected" -->
@@ -8993,16 +9204,17 @@
          <xsl:if test="$with-key">
             <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:array[@key='observations']/j:map/j:[@key='collected']"
+   <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>
+      <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:[@key='expires']"
+   <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/observation/expires" -->
@@ -9022,16 +9234,17 @@
          <xsl:if test="$with-key">
             <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:array[@key='observations']/j:map/j:[@key='expires']"
+   <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>
+      <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:[@key='title']"
+   <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/risk/title" -->
@@ -9051,16 +9264,17 @@
          <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:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='description']"
+   <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/risk/description" -->
@@ -9081,16 +9295,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='statement']"
+   <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/risk/statement" -->
@@ -9111,16 +9326,17 @@
          <xsl:if test="$with-key">
             <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:array[@key='risks']/j:map/j:[@key='statement']"
+   <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>
+      <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:[@key='text']"
+   <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/risk/link/text" -->
@@ -9140,16 +9356,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='status']"
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:string[@key='status']"
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/status" -->
@@ -9169,16 +9386,17 @@
          <xsl:if test="$with-key">
             <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='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:[@key='status']"
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:string[@key='status']"
                  mode="get-value-property"
                  priority="7">
-      <value>
+      <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='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/risk/origin/actor/link/text" -->
@@ -9198,16 +9416,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/risk/origin/related-task/link/text" -->
@@ -9227,16 +9446,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/risk/origin/related-task/responsible-party/link/text" -->
@@ -9256,16 +9476,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='description']"
+   <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/risk/origin/related-task/subject/description" -->
@@ -9286,16 +9507,17 @@
          <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='subjects']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/risk/origin/related-task/subject/link/text" -->
@@ -9315,12 +9537,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -9344,7 +9567,7 @@
          </xsl:if>
       </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:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/risk/origin/related-task/subject/include-subject/link/text" -->
@@ -9364,16 +9587,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/risk/origin/related-task/subject/exclude-subject/link/text" -->
@@ -9393,12 +9617,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -9423,7 +9648,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -9444,16 +9669,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/risk/origin/related-task/identified-subject/subject/link/text" -->
@@ -9473,12 +9699,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -9502,7 +9729,7 @@
          </xsl:if>
       </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:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/risk/origin/related-task/identified-subject/subject/include-subject/link/text" -->
@@ -9522,16 +9749,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/risk/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
@@ -9551,16 +9779,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/risk/characterization/link/text" -->
@@ -9580,16 +9809,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/risk/characterization/origin/actor/link/text" -->
@@ -9609,16 +9839,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='actors']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/risk/characterization/origin/related-task/link/text" -->
@@ -9638,16 +9869,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/risk/characterization/origin/related-task/responsible-party/link/text" -->
@@ -9667,16 +9899,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='description']"
+   <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/risk/characterization/origin/related-task/subject/description" -->
@@ -9697,16 +9930,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/risk/characterization/origin/related-task/subject/link/text" -->
@@ -9726,12 +9960,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -9755,7 +9990,7 @@
          </xsl:if>
       </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='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/risk/characterization/origin/related-task/subject/include-subject/link/text" -->
@@ -9775,16 +10010,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/risk/characterization/origin/related-task/subject/exclude-subject/link/text" -->
@@ -9804,12 +10040,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -9834,7 +10071,7 @@
          <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:[@key='description']"
+   <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/risk/characterization/origin/related-task/identified-subject/subject/description" -->
@@ -9855,16 +10092,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/risk/characterization/origin/related-task/identified-subject/subject/link/text" -->
@@ -9884,12 +10122,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -9913,7 +10152,7 @@
          </xsl:if>
       </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:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/risk/characterization/origin/related-task/identified-subject/subject/include-subject/link/text" -->
@@ -9933,16 +10172,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/risk/characterization/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
@@ -9962,12 +10202,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -9992,7 +10233,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -10012,12 +10253,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -10042,7 +10284,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -10063,16 +10305,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -10092,12 +10335,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -10108,7 +10352,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/risk/mitigating-factor/subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/risk/mitigating-factors/subjects"
                 name="subject-reference"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:subject-reference"
                 _step="subject"
                 _key="subjects"
@@ -10125,7 +10369,7 @@
          <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:[@key='title']"
+   <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/risk/mitigating-factor/subject/title" -->
@@ -10145,16 +10389,17 @@
          <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:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/risk/mitigating-factor/subject/link/text" -->
@@ -10174,16 +10419,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='deadline']"
+   <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/risk/deadline" -->
@@ -10203,12 +10449,13 @@
          <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:[@key='deadline']"
+   <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>
+      <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -10219,7 +10466,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/risk/response"
                 _metaschema-json-id="/assembly/oscal-assessment-common/risk/remediations"
                 name="response"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:response"
                 _step="response"
                 _key="remediations"
@@ -10240,7 +10487,7 @@
          <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:[@key='title']"
+   <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/risk/response/title" -->
@@ -10260,16 +10507,17 @@
          <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:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='description']"
+   <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" -->
@@ -10290,16 +10538,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/risk/response/link/text" -->
@@ -10319,16 +10568,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/risk/response/origin/actor/link/text" -->
@@ -10348,16 +10598,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/risk/response/origin/related-task/link/text" -->
@@ -10377,16 +10628,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/response/origin/related-task/responsible-party/link/text" -->
@@ -10406,16 +10658,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='description']"
+   <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/response/origin/related-task/subject/description" -->
@@ -10436,16 +10689,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/response/origin/related-task/subject/link/text" -->
@@ -10465,12 +10719,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -10494,7 +10749,7 @@
          </xsl:if>
       </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:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/response/origin/related-task/subject/include-subject/link/text" -->
@@ -10514,16 +10769,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/response/origin/related-task/subject/exclude-subject/link/text" -->
@@ -10543,12 +10799,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -10573,7 +10830,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -10594,16 +10851,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/response/origin/related-task/identified-subject/subject/link/text" -->
@@ -10623,12 +10881,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -10652,7 +10911,7 @@
          </xsl:if>
       </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:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/response/origin/related-task/identified-subject/subject/include-subject/link/text" -->
@@ -10672,16 +10931,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/response/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
@@ -10701,12 +10961,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -10739,7 +11000,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/response/required-asset/subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/response/required-assets/subjects"
                 name="subject-reference"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:subject-reference"
                 _step="subject"
                 _key="subjects"
@@ -10756,7 +11017,7 @@
          <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:[@key='title']"
+   <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" -->
@@ -10776,16 +11037,17 @@
          <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:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/response/required-asset/subject/link/text" -->
@@ -10805,16 +11067,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='title']"
+   <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/response/required-asset/title" -->
@@ -10834,16 +11097,17 @@
          <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:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='description']"
+   <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/response/required-asset/description" -->
@@ -10864,16 +11128,17 @@
          <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='required-assets']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/response/required-asset/link/text" -->
@@ -10893,16 +11158,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='title']"
+   <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/response//task/title" -->
@@ -10922,16 +11188,17 @@
          <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='tasks']/j:map/j:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='description']"
+   <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/response//task/description" -->
@@ -10952,16 +11219,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/response//task/link/text" -->
@@ -10981,12 +11249,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -11115,7 +11384,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -11135,16 +11404,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/response//task/associated-activity/responsible-role/link/text" -->
@@ -11164,16 +11434,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='description']"
+   <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/response//task/associated-activity/subject/description" -->
@@ -11194,16 +11465,17 @@
          <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='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/response//task/associated-activity/subject/link/text" -->
@@ -11223,12 +11495,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -11252,7 +11525,7 @@
          </xsl:if>
       </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='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/response//task/associated-activity/subject/include-subject/link/text" -->
@@ -11272,16 +11545,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/response//task/associated-activity/subject/exclude-subject/link/text" -->
@@ -11301,16 +11575,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='description']"
+   <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" -->
@@ -11331,16 +11606,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/response//task/subject/link/text" -->
@@ -11360,12 +11636,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -11389,7 +11666,7 @@
          </xsl:if>
       </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='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/response//task/subject/include-subject/link/text" -->
@@ -11409,16 +11686,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/response//task/subject/exclude-subject/link/text" -->
@@ -11438,16 +11716,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/response//task/responsible-role/link/text" -->
@@ -11467,12 +11746,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -11522,7 +11802,7 @@
          <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:[@key='title']"
+   <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/risk-log/entry/title" -->
@@ -11542,16 +11822,17 @@
          <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:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='description']"
+   <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/risk-log/entry/description" -->
@@ -11572,16 +11853,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='start']"
+   <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" -->
@@ -11601,16 +11883,17 @@
          <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:[@key='start']"
+   <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>
+      <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:[@key='end']"
+   <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/risk-log/entry/end" -->
@@ -11630,16 +11913,17 @@
          <xsl:if test="$with-key">
             <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:map[@key='risk-log']/j:array[@key='entries']/j:map/j:[@key='end']"
+   <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>
+      <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:[@key='text']"
+   <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/risk-log/entry/link/text" -->
@@ -11659,12 +11943,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -11688,7 +11973,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -11708,16 +11993,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/risk-log/entry/related-response/related-task/link/text" -->
@@ -11737,16 +12023,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/risk-log/entry/related-response/related-task/responsible-party/link/text" -->
@@ -11766,16 +12053,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-parties']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='description']"
+   <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/risk-log/entry/related-response/related-task/subject/description" -->
@@ -11796,16 +12084,17 @@
          <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:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/risk-log/entry/related-response/related-task/subject/link/text" -->
@@ -11825,12 +12114,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -11854,7 +12144,7 @@
          </xsl:if>
       </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:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/risk-log/entry/related-response/related-task/subject/include-subject/link/text" -->
@@ -11874,16 +12164,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/risk-log/entry/related-response/related-task/subject/exclude-subject/link/text" -->
@@ -11903,12 +12194,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -11933,7 +12225,7 @@
          <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:[@key='description']"
+   <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/risk-log/entry/related-response/related-task/identified-subject/subject/description" -->
@@ -11954,16 +12246,17 @@
          <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: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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/risk-log/entry/related-response/related-task/identified-subject/subject/link/text" -->
@@ -11983,12 +12276,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -12012,7 +12306,7 @@
          </xsl:if>
       </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:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/risk-log/entry/related-response/related-task/identified-subject/subject/include-subject/link/text" -->
@@ -12032,16 +12326,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/risk-log/entry/related-response/related-task/identified-subject/subject/exclude-subject/link/text" -->
@@ -12061,12 +12356,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -12087,7 +12383,7 @@
          <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:[@key='title']"
+   <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/finding/title" -->
@@ -12107,16 +12403,17 @@
          <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='findings']/j:map/j:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='description']"
+   <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/finding/description" -->
@@ -12137,16 +12434,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/finding/link/text" -->
@@ -12166,16 +12464,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/finding/origin/actor/link/text" -->
@@ -12195,16 +12494,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/finding/origin/related-task/link/text" -->
@@ -12224,16 +12524,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/finding/origin/related-task/responsible-party/link/text" -->
@@ -12253,16 +12554,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-parties']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='description']"
+   <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/finding/origin/related-task/subject/description" -->
@@ -12283,16 +12585,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/finding/origin/related-task/subject/link/text" -->
@@ -12312,12 +12615,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -12341,7 +12645,7 @@
          </xsl:if>
       </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:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/finding/origin/related-task/subject/include-subject/link/text" -->
@@ -12361,16 +12665,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/finding/origin/related-task/subject/exclude-subject/link/text" -->
@@ -12390,12 +12695,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -12420,7 +12726,7 @@
          <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:[@key='description']"
+   <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/finding/origin/related-task/identified-subject/subject/description" -->
@@ -12441,16 +12747,17 @@
          <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:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/finding/origin/related-task/identified-subject/subject/link/text" -->
@@ -12470,12 +12777,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -12499,7 +12807,7 @@
          </xsl:if>
       </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:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/finding/origin/related-task/identified-subject/subject/include-subject/link/text" -->
@@ -12519,16 +12827,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/finding/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
@@ -12548,16 +12857,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='title']"
+   <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/finding/target/title" -->
@@ -12577,16 +12887,17 @@
          <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='findings']/j:map/j:map[@key='target']/j:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='description']"
+   <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/finding/target/description" -->
@@ -12607,16 +12918,17 @@
          <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:map[@key='target']/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/finding/target/link/text" -->
@@ -12636,74 +12948,39 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:map[@key='target']/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='status']"
+   <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" -->
-      <field _step="status"
-             _key="status"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/finding-target/status"
-             _metaschema-json-id="/assembly/oscal-assessment-common/finding-target/status"
-             collapsible="no"
-             as-type="token"
-             name="status"
-             key="status"
-             _using-name="status"
-             _in-xml-name="status"
-             _in-json-name="status"
-             gi="status"
-             in-json="SCALAR">
+      <assembly _step="status"
+                _key="status"
+                _metaschema-xml-id="/assembly/oscal-assessment-common/finding-target/status"
+                _metaschema-json-id="/assembly/oscal-assessment-common/finding-target/status"
+                name="status"
+                key="status"
+                _using-name="status"
+                _in-xml-name="status"
+                _in-json-name="status"
+                gi="status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
-      </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:[@key='status']"
-                 mode="get-value-property"
-                 priority="8">
-      <value>
-         <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:[@key='reason']"
-                 priority="8">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/finding/target/reason" -->
-      <field _step="reason"
-             _key="reason"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/finding-target/reason"
-             _metaschema-json-id="/assembly/oscal-assessment-common/finding-target/reason"
-             collapsible="no"
-             as-type="NCName"
-             name="reason"
-             key="reason"
-             _using-name="reason"
-             _in-xml-name="reason"
-             _in-json-name="reason"
-             gi="reason"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">reason</xsl:attribute>
-         </xsl:if>
-      </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:[@key='reason']"
-                 mode="get-value-property"
-                 priority="8">
-      <value>
-         <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='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:[@key='implementation-statement-uuid']"
+   <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/finding/implementation-statement-uuid" -->
@@ -12723,12 +13000,13 @@
          <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:[@key='implementation-statement-uuid']"
+   <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>
+      <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -12790,7 +13068,7 @@
          <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:[@key='title']"
+   <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/back-matter/resource/title" -->
@@ -12810,16 +13088,17 @@
          <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='back-matter']/j:array[@key='resources']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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/back-matter/resource/description" -->
@@ -12840,12 +13119,13 @@
          <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='back-matter']/j:array[@key='resources']/j:map/j:[@key='description']"
+   <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>
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -12858,7 +13138,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -12900,7 +13180,7 @@
          <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:[@key='text']"
+   <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/back-matter/resource/citation/text" -->
@@ -12920,16 +13200,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/back-matter/resource/citation/link/text" -->
@@ -12949,12 +13230,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -13044,11 +13326,11 @@
       <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"/>
diff --git a/xml/convert/oscal_catalog_json-to-xml-converter.xsl b/xml/convert/oscal_catalog_json-to-xml-converter.xsl
index 86333b8f31..eb4ec46fb2 100644
--- a/xml/convert/oscal_catalog_json-to-xml-converter.xsl
+++ b/xml/convert/oscal_catalog_json-to-xml-converter.xsl
@@ -78,7 +78,7 @@
                 _metaschema-json-id="/assembly/oscal-catalog/catalog"
                 name="catalog"
                 key="catalog"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_catalog_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_catalog_metaschema.xml"
                 _key-name="oscal-catalog:catalog"
                 _using-root-name="catalog"
                 gi="catalog">
@@ -103,7 +103,7 @@
                 _metaschema-json-id="/assembly/oscal-catalog/catalog/metadata"
                 name="metadata"
                 key="metadata"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:metadata"
                 _step="metadata"
                 _key="metadata"
@@ -137,7 +137,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/revision/prop"
                 _metaschema-json-id="/assembly/oscal-metadata/revision/props"
                 name="property"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:property"
                 _step="prop"
                 _key="props"
@@ -160,7 +160,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/revision/link"
                 _metaschema-json-id="/assembly/oscal-metadata/revision/links"
                 name="link"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:link"
                 _step="link"
                 _key="links"
@@ -181,7 +181,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/role"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/roles"
                 name="role"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:role"
                 _step="role"
                 _key="roles"
@@ -205,7 +205,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/location"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/locations"
                 name="location"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:location"
                 _step="location"
                 _key="locations"
@@ -231,7 +231,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/party"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/parties"
                 name="party"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:party"
                 _step="party"
                 _key="parties"
@@ -261,7 +261,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/responsible-party"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/responsible-parties"
                 name="responsible-party"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:responsible-party"
                 _step="responsible-party"
                 _key="responsible-parties"
@@ -283,7 +283,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-catalog/catalog/param"
                 _metaschema-json-id="/assembly/oscal-catalog/catalog/params"
                 name="parameter"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
                 _key-name="oscal-catalog-common:parameter"
                 _step="param"
                 _key="params"
@@ -312,7 +312,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/constraint"
                 _metaschema-json-id="/assembly/oscal-catalog-common/parameter/constraints"
                 name="parameter-constraint"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
                 _key-name="oscal-catalog-common:parameter-constraint"
                 _step="constraint"
                 _key="constraints"
@@ -331,7 +331,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/guideline"
                 _metaschema-json-id="/assembly/oscal-catalog-common/parameter/guidelines"
                 name="parameter-guideline"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
                 _key-name="oscal-catalog-common:parameter-guideline"
                 _step="guideline"
                 _key="guidelines"
@@ -350,7 +350,7 @@
                 _metaschema-json-id="/assembly/oscal-catalog-common/parameter/select"
                 name="parameter-selection"
                 key="select"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
                 _key-name="oscal-catalog-common:parameter-selection"
                 _step="select"
                 _key="select"
@@ -372,7 +372,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-catalog/catalog/control"
                 _metaschema-json-id="/assembly/oscal-catalog/catalog/controls"
                 name="control"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_catalog_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_catalog_metaschema.xml"
                 _key-name="oscal-catalog:control"
                 _step="control"
                 _key="controls"
@@ -397,7 +397,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-catalog/control/part"
                 _metaschema-json-id="/assembly/oscal-catalog/control/parts"
                 name="part"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
                 _key-name="oscal-catalog-common:part"
                 _step="part"
                 _key="parts"
@@ -423,7 +423,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-catalog/catalog/group"
                 _metaschema-json-id="/assembly/oscal-catalog/catalog/groups"
                 name="group"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_catalog_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_catalog_metaschema.xml"
                 _key-name="oscal-catalog:group"
                 _step="group"
                 _key="groups"
@@ -450,7 +450,7 @@
                 _metaschema-json-id="/assembly/oscal-catalog/catalog/back-matter"
                 name="back-matter"
                 key="back-matter"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:back-matter"
                 _step="back-matter"
                 _key="back-matter"
@@ -465,7 +465,7 @@
          <xsl:apply-templates select="*[@key='resources']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:[@key='remarks']">
+   <xsl:template match="j:string[@key='remarks']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="remarks" -->
       <field _metaschema-xml-id="/assembly/oscal-metadata/property/remarks"
@@ -475,7 +475,7 @@
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:remarks"
              _step="remarks"
              _key="remarks"
@@ -488,14 +488,17 @@
          <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:[@key='remarks']" mode="get-value-property" priority="8">
-      <value>
+   <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:">
+   <xsl:template match="j:array[@key='location-uuids']/j:string">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="location-uuid" -->
       <field _metaschema-xml-id="/assembly/oscal-metadata/party/location-uuid"
@@ -503,7 +506,7 @@
              collapsible="no"
              as-type="uuid"
              name="location-uuid"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:location-uuid"
              _step="location-uuid"
              _key="location-uuids"
@@ -512,16 +515,18 @@
              _in-xml-name="location-uuid"
              _in-json-name="location-uuids"
              gi="location-uuid"
-             in-json="SCALAR"/>
+             in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="j:array[@key='location-uuids']/j:"
+   <xsl:template match="j:array[@key='location-uuids']/j:string"
                  mode="get-value-property"
                  priority="8">
-      <value>
+      <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:array[@key='party-uuids']/j:">
+   <xsl:template match="j:array[@key='party-uuids']/j:string">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="party-uuid" -->
       <field _metaschema-xml-id="/assembly/oscal-metadata/responsible-party/party-uuid"
@@ -529,7 +534,7 @@
              collapsible="no"
              as-type="uuid"
              name="party-uuid"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:party-uuid"
              _step="party-uuid"
              _key="party-uuids"
@@ -538,16 +543,18 @@
              _in-xml-name="party-uuid"
              _in-json-name="party-uuids"
              gi="party-uuid"
-             in-json="SCALAR"/>
+             in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="j:array[@key='party-uuids']/j:"
+   <xsl:template match="j:array[@key='party-uuids']/j:string"
                  mode="get-value-property"
                  priority="7">
-      <value>
+      <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="(j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'])">
+   <xsl:template match="(j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'])">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="value" -->
       <field _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/value"
@@ -555,7 +562,7 @@
              collapsible="no"
              as-type="string"
              name="parameter-value"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
              _key-name="oscal-catalog-common:parameter-value"
              _step="value"
              _key="values"
@@ -564,12 +571,14 @@
              _in-xml-name="value"
              _in-json-name="values"
              gi="value"
-             in-json="SCALAR"/>
+             in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="(j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'])"
+   <xsl:template match="(j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'])"
                  mode="get-value-property"
                  priority="7">
-      <value>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -581,7 +590,7 @@
              collapsible="no"
              as-type="string"
              name="hash"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:hash"
              _step="hash"
              _key="hashes"
@@ -759,7 +768,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/link/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -839,7 +848,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/address/type"
             name="location-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:location-type"
             _step="type"
             _key="type"
@@ -996,7 +1005,7 @@
             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/depends-on"
             name="depends-on"
             key="depends-on"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
             _key-name="oscal-catalog-common:depends-on"
             _step="depends-on"
             _key="depends-on"
@@ -1229,7 +1238,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -1290,7 +1299,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -1305,7 +1314,7 @@
    <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>
-   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:[@key='title']"
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:string[@key='title']"
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/title" -->
@@ -1325,16 +1334,17 @@
          <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='catalog']/j:map[@key='metadata']/j:[@key='title']"
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:string[@key='title']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='published']"
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:string[@key='published']"
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/published" -->
@@ -1344,7 +1354,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -1357,16 +1367,17 @@
          <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='catalog']/j:map[@key='metadata']/j:[@key='published']"
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:string[@key='published']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='last-modified']"
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:string[@key='last-modified']"
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/last-modified" -->
@@ -1376,7 +1387,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -1389,16 +1400,17 @@
          <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='catalog']/j:map[@key='metadata']/j:[@key='last-modified']"
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:string[@key='last-modified']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='version']"
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:string[@key='version']"
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/version" -->
@@ -1408,7 +1420,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -1421,16 +1433,17 @@
          <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='catalog']/j:map[@key='metadata']/j:[@key='version']"
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:string[@key='version']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='oscal-version']"
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:string[@key='oscal-version']"
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/oscal-version" -->
@@ -1440,7 +1453,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -1453,12 +1466,13 @@
          <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='catalog']/j:map[@key='metadata']/j:[@key='oscal-version']"
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:string[@key='oscal-version']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -1469,7 +1483,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/revisions/revision"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/revisions"
                 name="revision"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:revision"
                 _step="revisions/revision"
                 _key="revisions"
@@ -1497,7 +1511,7 @@
              group-json="ARRAY"
              name="revision"
              key="revisions"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:revision"
              _key-ref="oscal-metadata:revision">
          <xsl:if test="$with-key">
@@ -1506,7 +1520,7 @@
          <xsl:apply-templates select="*"/>
       </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:[@key='title']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions/revision/title" -->
@@ -1526,16 +1540,17 @@
          <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='catalog']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='title']"
+   <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">
-      <value>
+      <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:[@key='published']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions/revision/published" -->
@@ -1545,7 +1560,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -1558,16 +1573,17 @@
          <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='catalog']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='published']"
+   <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">
-      <value>
+      <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:[@key='last-modified']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions/revision/last-modified" -->
@@ -1577,7 +1593,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -1590,16 +1606,17 @@
          <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='catalog']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='last-modified']"
+   <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">
-      <value>
+      <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:[@key='version']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions/revision/version" -->
@@ -1609,7 +1626,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -1622,16 +1639,17 @@
          <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='catalog']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='version']"
+   <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">
-      <value>
+      <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:[@key='oscal-version']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions/revision/oscal-version" -->
@@ -1641,7 +1659,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -1654,16 +1672,17 @@
          <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='catalog']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='oscal-version']"
+   <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">
-      <value>
+      <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:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions/revision/link/text" -->
@@ -1683,12 +1702,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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">
-      <value>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -1701,7 +1721,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -1721,7 +1741,7 @@
          <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:[@key='text']"
+   <xsl:template match="j:map[@key='catalog']/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="catalog/metadata/link/text" -->
@@ -1741,16 +1761,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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">
-      <value>
+      <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:[@key='title']"
+   <xsl:template match="j:map[@key='catalog']/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="catalog/metadata/role/title" -->
@@ -1770,16 +1791,17 @@
          <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='catalog']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:[@key='title']"
+   <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">
-      <value>
+      <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:[@key='short-name']"
+   <xsl:template match="j:map[@key='catalog']/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="catalog/metadata/role/short-name" -->
@@ -1799,16 +1821,17 @@
          <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='catalog']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:[@key='short-name']"
+   <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">
-      <value>
+      <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:[@key='description']"
+   <xsl:template match="j:map[@key='catalog']/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="catalog/metadata/role/description" -->
@@ -1829,16 +1852,17 @@
          <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='catalog']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:[@key='description']"
+   <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">
-      <value>
+      <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:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/role/link/text" -->
@@ -1858,16 +1882,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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">
-      <value>
+      <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:[@key='title']"
+   <xsl:template match="j:map[@key='catalog']/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="catalog/metadata/location/title" -->
@@ -1887,12 +1912,13 @@
          <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='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:[@key='title']"
+   <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">
-      <value>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -1904,7 +1930,7 @@
                 _metaschema-json-id="/assembly/oscal-metadata/location/address"
                 name="address"
                 key="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="address"
@@ -1924,7 +1950,7 @@
          <xsl:apply-templates select="*[@key='country']"/>
       </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:"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/address/addr-line" -->
@@ -1933,7 +1959,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -1942,16 +1968,18 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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:"
+   <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">
-      <value>
+      <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:[@key='city']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/address/city" -->
@@ -1971,16 +1999,17 @@
          <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='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:[@key='city']"
+   <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">
-      <value>
+      <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:[@key='state']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/address/state" -->
@@ -2000,16 +2029,17 @@
          <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='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:[@key='state']"
+   <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">
-      <value>
+      <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:[@key='postal-code']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/address/postal-code" -->
@@ -2029,16 +2059,17 @@
          <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='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:[@key='postal-code']"
+   <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">
-      <value>
+      <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:[@key='country']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/address/country" -->
@@ -2058,16 +2089,17 @@
          <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='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:[@key='country']"
+   <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">
-      <value>
+      <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:"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/email-address" -->
@@ -2076,7 +2108,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -2085,12 +2117,14 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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:"
+   <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">
-      <value>
+      <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -2103,7 +2137,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -2123,7 +2157,7 @@
          <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:"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/url" -->
@@ -2138,16 +2172,18 @@
              _in-xml-name="url"
              _in-json-name="urls"
              gi="url"
-             in-json="SCALAR"/>
+             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:"
+   <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">
-      <value>
+      <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:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/link/text" -->
@@ -2167,16 +2203,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='locations']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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">
-      <value>
+      <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:[@key='name']"
+   <xsl:template match="j:map[@key='catalog']/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="catalog/metadata/party/name" -->
@@ -2196,16 +2233,17 @@
          <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='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:[@key='name']"
+   <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">
-      <value>
+      <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:[@key='short-name']"
+   <xsl:template match="j:map[@key='catalog']/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="catalog/metadata/party/short-name" -->
@@ -2225,12 +2263,13 @@
          <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='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:[@key='short-name']"
+   <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">
-      <value>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -2260,7 +2299,7 @@
          <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:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/link/text" -->
@@ -2280,16 +2319,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='parties']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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">
-      <value>
+      <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:"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/email-address" -->
@@ -2298,7 +2338,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -2307,12 +2347,14 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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:"
+   <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">
-      <value>
+      <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -2325,7 +2367,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -2352,7 +2394,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/party/address"
                 _metaschema-json-id="/assembly/oscal-metadata/party/addresses"
                 name="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="addresses"
@@ -2369,7 +2411,7 @@
          <xsl:apply-templates select="*[@key='country']"/>
       </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:"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/address/addr-line" -->
@@ -2378,7 +2420,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -2387,16 +2429,18 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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:"
+   <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">
-      <value>
+      <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:[@key='city']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/address/city" -->
@@ -2416,16 +2460,17 @@
          <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='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:[@key='city']"
+   <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">
-      <value>
+      <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:[@key='state']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/address/state" -->
@@ -2445,16 +2490,17 @@
          <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='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:[@key='state']"
+   <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">
-      <value>
+      <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:[@key='postal-code']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/address/postal-code" -->
@@ -2474,16 +2520,17 @@
          <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='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:[@key='postal-code']"
+   <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">
-      <value>
+      <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:[@key='country']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/address/country" -->
@@ -2503,16 +2550,17 @@
          <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='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:[@key='country']"
+   <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">
-      <value>
+      <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:"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/member-of-organization" -->
@@ -2527,16 +2575,18 @@
              _in-xml-name="member-of-organization"
              _in-json-name="member-of-organizations"
              gi="member-of-organization"
-             in-json="SCALAR"/>
+             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:"
+   <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">
-      <value>
+      <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:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/responsible-party/link/text" -->
@@ -2556,16 +2606,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-parties']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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">
-      <value>
+      <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:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/param/link/text" -->
@@ -2585,16 +2636,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='params']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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">
-      <value>
+      <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:[@key='label']"
+   <xsl:template match="j:map[@key='catalog']/j:array[@key='params']/j:map/j:string[@key='label']"
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/param/label" -->
@@ -2614,16 +2666,17 @@
          <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='catalog']/j:array[@key='params']/j:map/j:[@key='label']"
+   <xsl:template match="j:map[@key='catalog']/j:array[@key='params']/j:map/j:string[@key='label']"
                  mode="get-value-property"
                  priority="5">
-      <value>
+      <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:[@key='usage']"
+   <xsl:template match="j:map[@key='catalog']/j:array[@key='params']/j:map/j:string[@key='usage']"
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/param/usage" -->
@@ -2644,16 +2697,17 @@
          <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='catalog']/j:array[@key='params']/j:map/j:[@key='usage']"
+   <xsl:template match="j:map[@key='catalog']/j:array[@key='params']/j:map/j:string[@key='usage']"
                  mode="get-value-property"
                  priority="5">
-      <value>
+      <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:[@key='description']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/param/constraint/description" -->
@@ -2674,12 +2728,13 @@
          <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='catalog']/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:[@key='description']"
+   <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">
-      <value>
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -2700,7 +2755,7 @@
          <xsl:apply-templates select="*[@key='remarks']"/>
       </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:[@key='expression']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/param/constraint/test/expression" -->
@@ -2720,20 +2775,21 @@
          <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='catalog']/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map/j:[@key='expression']"
+   <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">
-      <value>
+      <value as-type="string" 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='guidelines']/j:map"
-                 priority="7">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="catalog/param/guideline" -->
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+   <!-- 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']">
+      <field scope="local"
+             _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _key="prose"
              _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
              _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
@@ -2744,21 +2800,16 @@
              key="prose"
              _using-name="prose"
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+             _in-json-name="prose">
+         <value as-type="markup-multiline"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6/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='catalog']/j:array[@key='params']/j:map/j:array[@key='guidelines']/j:map"
-                 mode="get-value-property"
-                 priority="7">
-      <value>
-         <xsl:value-of select="."/>
-      </value>
-   </xsl:template>
-   <xsl:template match="j:map[@key='catalog']/j:array[@key='params']/j:map/j:map[@key='select']/j:array[@key='choice']/j:"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/param/select/choice" -->
@@ -2773,16 +2824,18 @@
              _in-xml-name="choice"
              _in-json-name="choice"
              gi="choice"
-             in-json="SCALAR"/>
+             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:"
+   <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">
-      <value>
+      <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:[@key='title']"
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:string[@key='title']"
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/title" -->
@@ -2802,16 +2855,17 @@
          <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='catalog']//j:array[@key='controls']/j:map/j:[@key='title']"
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:string[@key='title']"
                  mode="get-value-property"
                  priority="5">
-      <value>
+      <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:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/param/link/text" -->
@@ -2831,16 +2885,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:array[@key='params']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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">
-      <value>
+      <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:[@key='label']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/param/label" -->
@@ -2860,16 +2915,17 @@
          <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='catalog']//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:[@key='label']"
+   <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">
-      <value>
+      <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:[@key='usage']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/param/usage" -->
@@ -2890,16 +2946,17 @@
          <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='catalog']//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:[@key='usage']"
+   <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">
-      <value>
+      <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:[@key='description']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/param/constraint/description" -->
@@ -2920,12 +2977,13 @@
          <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='catalog']//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:[@key='description']"
+   <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">
-      <value>
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -2946,7 +3004,7 @@
          <xsl:apply-templates select="*[@key='remarks']"/>
       </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:[@key='expression']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/param/constraint/test/expression" -->
@@ -2966,20 +3024,21 @@
          <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='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:[@key='expression']"
+   <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">
-      <value>
+      <value as-type="string" 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='guidelines']/j:map"
-                 priority="9">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="catalog//control/param/guideline" -->
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+   <!-- 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']">
+      <field scope="local"
+             _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _key="prose"
              _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
              _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
@@ -2990,21 +3049,16 @@
              key="prose"
              _using-name="prose"
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+             _in-json-name="prose">
+         <value as-type="markup-multiline"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6/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='catalog']//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:array[@key='guidelines']/j:map"
-                 mode="get-value-property"
-                 priority="9">
-      <value>
-         <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:map[@key='select']/j:array[@key='choice']/j:"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/param/select/choice" -->
@@ -3019,16 +3073,18 @@
              _in-xml-name="choice"
              _in-json-name="choice"
              gi="choice"
-             in-json="SCALAR"/>
+             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:"
+   <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">
-      <value>
+      <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:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/link/text" -->
@@ -3048,16 +3104,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:array[@key='links']/j:map/j:[@key='text']"
+   <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">
-      <value>
+      <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:[@key='title']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control//part/title" -->
@@ -3077,20 +3134,21 @@
          <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='catalog']//j:array[@key='controls']/j:map//j:array[@key='parts']/j:map/j:[@key='title']"
+   <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">
-      <value>
+      <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"
-                 priority="7">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="catalog//control//part" -->
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+   <!-- 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']">
+      <field scope="local"
+             _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _key="prose"
              _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
              _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
@@ -3101,21 +3159,16 @@
              key="prose"
              _using-name="prose"
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+             _in-json-name="prose">
+         <value as-type="markup-multiline"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6/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='catalog']//j:array[@key='controls']/j:map//j:array[@key='parts']/j:map"
-                 mode="get-value-property"
-                 priority="7">
-      <value>
-         <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:array[@key='links']/j:map/j:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control//part/link/text" -->
@@ -3135,16 +3188,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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">
-      <value>
+      <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:[@key='title']"
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:string[@key='title']"
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/title" -->
@@ -3164,16 +3218,17 @@
          <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='catalog']//j:array[@key='groups']/j:map/j:[@key='title']"
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:string[@key='title']"
                  mode="get-value-property"
                  priority="5">
-      <value>
+      <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:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/param/link/text" -->
@@ -3193,16 +3248,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='params']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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">
-      <value>
+      <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:[@key='label']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/param/label" -->
@@ -3222,16 +3278,17 @@
          <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='catalog']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:[@key='label']"
+   <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">
-      <value>
+      <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:[@key='usage']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/param/usage" -->
@@ -3252,16 +3309,17 @@
          <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='catalog']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:[@key='usage']"
+   <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">
-      <value>
+      <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:[@key='description']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/param/constraint/description" -->
@@ -3282,12 +3340,13 @@
          <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='catalog']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:[@key='description']"
+   <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">
-      <value>
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3308,7 +3367,7 @@
          <xsl:apply-templates select="*[@key='remarks']"/>
       </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:[@key='expression']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/param/constraint/test/expression" -->
@@ -3328,20 +3387,21 @@
          <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='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:[@key='expression']"
+   <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">
-      <value>
+      <value as-type="string" 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='guidelines']/j:map"
-                 priority="9">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="catalog//group/param/guideline" -->
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+   <!-- 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']">
+      <field scope="local"
+             _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _key="prose"
              _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
              _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
@@ -3352,21 +3412,16 @@
              key="prose"
              _using-name="prose"
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+             _in-json-name="prose">
+         <value as-type="markup-multiline"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6/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='catalog']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='guidelines']/j:map"
-                 mode="get-value-property"
-                 priority="9">
-      <value>
-         <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:map[@key='select']/j:array[@key='choice']/j:"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/param/select/choice" -->
@@ -3381,16 +3436,18 @@
              _in-xml-name="choice"
              _in-json-name="choice"
              gi="choice"
-             in-json="SCALAR"/>
+             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:"
+   <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">
-      <value>
+      <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:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/link/text" -->
@@ -3410,16 +3467,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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">
-      <value>
+      <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:[@key='title']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//part/title" -->
@@ -3439,20 +3497,21 @@
          <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='catalog']//j:array[@key='groups']/j:map//j:array[@key='parts']/j:map/j:[@key='title']"
+   <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">
-      <value>
+      <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"
-                 priority="7">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="catalog//group//part" -->
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+   <!-- 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']">
+      <field scope="local"
+             _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _key="prose"
              _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
              _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
@@ -3463,21 +3522,16 @@
              key="prose"
              _using-name="prose"
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+             _in-json-name="prose">
+         <value as-type="markup-multiline"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6/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='catalog']//j:array[@key='groups']/j:map//j:array[@key='parts']/j:map"
-                 mode="get-value-property"
-                 priority="7">
-      <value>
-         <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:array[@key='links']/j:map/j:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//part/link/text" -->
@@ -3497,16 +3551,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='parts']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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">
-      <value>
+      <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:[@key='title']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/title" -->
@@ -3526,16 +3581,17 @@
          <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='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:[@key='title']"
+   <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">
-      <value>
+      <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:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/param/link/text" -->
@@ -3555,16 +3611,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:array[@key='params']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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">
-      <value>
+      <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:[@key='label']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/param/label" -->
@@ -3584,16 +3641,17 @@
          <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='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:[@key='label']"
+   <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">
-      <value>
+      <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:[@key='usage']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/param/usage" -->
@@ -3614,16 +3672,17 @@
          <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='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:[@key='usage']"
+   <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">
-      <value>
+      <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:[@key='description']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/param/constraint/description" -->
@@ -3644,12 +3703,13 @@
          <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='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:[@key='description']"
+   <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">
-      <value>
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3670,7 +3730,7 @@
          <xsl:apply-templates select="*[@key='remarks']"/>
       </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:[@key='expression']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/param/constraint/test/expression" -->
@@ -3690,20 +3750,21 @@
          <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='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:[@key='expression']"
+   <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">
-      <value>
+      <value as-type="string" 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='guidelines']/j:map"
-                 priority="12">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="catalog//group//control/param/guideline" -->
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+   <!-- 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']">
+      <field scope="local"
+             _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _key="prose"
              _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
              _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
@@ -3714,21 +3775,16 @@
              key="prose"
              _using-name="prose"
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+             _in-json-name="prose">
+         <value as-type="markup-multiline"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6/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='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"
-                 mode="get-value-property"
-                 priority="12">
-      <value>
-         <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:map[@key='select']/j:array[@key='choice']/j:"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/param/select/choice" -->
@@ -3743,16 +3799,18 @@
              _in-xml-name="choice"
              _in-json-name="choice"
              gi="choice"
-             in-json="SCALAR"/>
+             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:"
+   <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">
-      <value>
+      <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:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/link/text" -->
@@ -3772,16 +3830,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:array[@key='links']/j:map/j:[@key='text']"
+   <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">
-      <value>
+      <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:[@key='title']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control//part/title" -->
@@ -3801,20 +3860,21 @@
          <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='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map//j:array[@key='parts']/j:map/j:[@key='title']"
+   <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">
-      <value>
+      <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"
-                 priority="10">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="catalog//group//control//part" -->
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+   <!-- 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']">
+      <field scope="local"
+             _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _key="prose"
              _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
              _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
@@ -3825,21 +3885,16 @@
              key="prose"
              _using-name="prose"
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+             _in-json-name="prose">
+         <value as-type="markup-multiline"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6/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='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map//j:array[@key='parts']/j:map"
-                 mode="get-value-property"
-                 priority="10">
-      <value>
-         <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:array[@key='links']/j:map/j:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control//part/link/text" -->
@@ -3859,12 +3914,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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">
-      <value>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3892,7 +3948,7 @@
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:[@key='title']"
+   <xsl:template match="j:map[@key='catalog']/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="catalog/back-matter/resource/title" -->
@@ -3912,16 +3968,17 @@
          <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='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:[@key='title']"
+   <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">
-      <value>
+      <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:[@key='description']"
+   <xsl:template match="j:map[@key='catalog']/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="catalog/back-matter/resource/description" -->
@@ -3942,12 +3999,13 @@
          <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='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:[@key='description']"
+   <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">
-      <value>
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3960,7 +4018,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -4002,7 +4060,7 @@
          <xsl:apply-templates select="*[@key='links']"/>
       </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:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/back-matter/resource/citation/text" -->
@@ -4022,16 +4080,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:[@key='text']"
+   <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">
-      <value>
+      <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:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/back-matter/resource/citation/link/text" -->
@@ -4051,12 +4110,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:[@key='text']"
+   <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">
-      <value>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -4146,11 +4206,11 @@
       <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"/>
diff --git a/xml/convert/oscal_complete_json-to-xml-converter.xsl b/xml/convert/oscal_complete_json-to-xml-converter.xsl
index 4ea7925738..8eb7cfecc8 100644
--- a/xml/convert/oscal_complete_json-to-xml-converter.xsl
+++ b/xml/convert/oscal_complete_json-to-xml-converter.xsl
@@ -78,7 +78,7 @@
                 _metaschema-json-id="/assembly/oscal-catalog/catalog"
                 name="catalog"
                 key="catalog"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_catalog_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_catalog_metaschema.xml"
                 _key-name="oscal-catalog:catalog"
                 _using-root-name="catalog"
                 gi="catalog">
@@ -103,7 +103,7 @@
                 _metaschema-json-id="/assembly/oscal-catalog/catalog/metadata"
                 name="metadata"
                 key="metadata"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:metadata"
                 _step="metadata"
                 _key="metadata"
@@ -137,7 +137,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/revision/prop"
                 _metaschema-json-id="/assembly/oscal-metadata/revision/props"
                 name="property"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:property"
                 _step="prop"
                 _key="props"
@@ -160,7 +160,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/revision/link"
                 _metaschema-json-id="/assembly/oscal-metadata/revision/links"
                 name="link"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:link"
                 _step="link"
                 _key="links"
@@ -181,7 +181,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/role"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/roles"
                 name="role"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:role"
                 _step="role"
                 _key="roles"
@@ -205,7 +205,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/location"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/locations"
                 name="location"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:location"
                 _step="location"
                 _key="locations"
@@ -231,7 +231,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/party"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/parties"
                 name="party"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:party"
                 _step="party"
                 _key="parties"
@@ -261,7 +261,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/responsible-party"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/responsible-parties"
                 name="responsible-party"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:responsible-party"
                 _step="responsible-party"
                 _key="responsible-parties"
@@ -283,7 +283,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-catalog/catalog/param"
                 _metaschema-json-id="/assembly/oscal-catalog/catalog/params"
                 name="parameter"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
                 _key-name="oscal-catalog-common:parameter"
                 _step="param"
                 _key="params"
@@ -312,7 +312,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/constraint"
                 _metaschema-json-id="/assembly/oscal-catalog-common/parameter/constraints"
                 name="parameter-constraint"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
                 _key-name="oscal-catalog-common:parameter-constraint"
                 _step="constraint"
                 _key="constraints"
@@ -331,7 +331,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/guideline"
                 _metaschema-json-id="/assembly/oscal-catalog-common/parameter/guidelines"
                 name="parameter-guideline"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
                 _key-name="oscal-catalog-common:parameter-guideline"
                 _step="guideline"
                 _key="guidelines"
@@ -350,7 +350,7 @@
                 _metaschema-json-id="/assembly/oscal-catalog-common/parameter/select"
                 name="parameter-selection"
                 key="select"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
                 _key-name="oscal-catalog-common:parameter-selection"
                 _step="select"
                 _key="select"
@@ -372,7 +372,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-catalog/catalog/control"
                 _metaschema-json-id="/assembly/oscal-catalog/catalog/controls"
                 name="control"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_catalog_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_catalog_metaschema.xml"
                 _key-name="oscal-catalog:control"
                 _step="control"
                 _key="controls"
@@ -397,7 +397,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-catalog/control/part"
                 _metaschema-json-id="/assembly/oscal-catalog/control/parts"
                 name="part"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
                 _key-name="oscal-catalog-common:part"
                 _step="part"
                 _key="parts"
@@ -423,7 +423,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/terms-and-conditions/part"
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan/terms-and-conditions/parts"
                 name="assessment-part"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:assessment-part"
                 _step="part"
                 _key="parts"
@@ -449,7 +449,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-catalog/catalog/group"
                 _metaschema-json-id="/assembly/oscal-catalog/catalog/groups"
                 name="group"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_catalog_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_catalog_metaschema.xml"
                 _key-name="oscal-catalog:group"
                 _step="group"
                 _key="groups"
@@ -475,7 +475,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/custom/group"
                 _metaschema-json-id="/assembly/oscal-profile/custom/groups"
                 name="group"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:group"
                 _step="group"
                 _key="groups"
@@ -502,7 +502,7 @@
                 _metaschema-json-id="/assembly/oscal-catalog/catalog/back-matter"
                 name="back-matter"
                 key="back-matter"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:back-matter"
                 _step="back-matter"
                 _key="back-matter"
@@ -524,7 +524,7 @@
                 _metaschema-json-id="/assembly/oscal-profile/profile"
                 name="profile"
                 key="profile"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:profile"
                 _using-root-name="profile"
                 gi="profile">
@@ -548,7 +548,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/profile/import"
                 _metaschema-json-id="/assembly/oscal-profile/profile/imports"
                 name="import"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:import"
                 _step="import"
                 _key="imports"
@@ -571,7 +571,7 @@
                 _metaschema-json-id="/assembly/oscal-profile/import/include-all"
                 name="include-all"
                 key="include-all"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:include-all"
                 _step="include-all"
                 _key="include-all"
@@ -592,7 +592,7 @@
                 _metaschema-json-id="/assembly/oscal-profile/profile/merge"
                 name="merge"
                 key="merge"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:merge"
                 _step="merge"
                 _key="merge"
@@ -617,7 +617,7 @@
                 _metaschema-json-id="/assembly/oscal-profile/merge/combine"
                 name="combine"
                 key="combine"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:combine"
                 _step="combine"
                 _key="combine"
@@ -639,7 +639,7 @@
                 _metaschema-json-id="/assembly/oscal-profile/merge/custom"
                 name="custom"
                 key="custom"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:custom"
                 _step="custom"
                 _key="custom"
@@ -661,7 +661,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/group/insert-controls"
                 _metaschema-json-id="/assembly/oscal-profile/group/insert-controls"
                 name="insert-controls"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:insert-controls"
                 _step="insert-controls"
                 _key="insert-controls"
@@ -683,7 +683,7 @@
                 _metaschema-json-id="/assembly/oscal-profile/profile/modify"
                 name="modify"
                 key="modify"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:modify"
                 _step="modify"
                 _key="modify"
@@ -705,7 +705,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/modify/alter"
                 _metaschema-json-id="/assembly/oscal-profile/modify/alters"
                 name="alter"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:alter"
                 _step="alter"
                 _key="alters"
@@ -726,7 +726,7 @@
                 _metaschema-xml-id="/assembly/oscal-profile/alter/remove"
                 _metaschema-json-id="/assembly/oscal-profile/alter/removes"
                 name="remove"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:remove"
                 _step="remove"
                 _key="removes"
@@ -748,7 +748,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/alter/add"
                 _metaschema-json-id="/assembly/oscal-profile/alter/adds"
                 name="add"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:add"
                 _step="add"
                 _key="adds"
@@ -773,7 +773,7 @@
                 _metaschema-json-id="/assembly/oscal-component-definition/component-definition"
                 name="component-definition"
                 key="component-definition"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:component-definition"
                 _using-root-name="component-definition"
                 gi="component-definition">
@@ -798,7 +798,7 @@
                 _metaschema-xml-id="/assembly/oscal-component-definition/component-definition/import-component-definition"
                 _metaschema-json-id="/assembly/oscal-component-definition/component-definition/import-component-definitions"
                 name="import-component-definition"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:import-component-definition"
                 _step="import-component-definition"
                 _key="import-component-definitions"
@@ -816,7 +816,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/component-definition/component"
                 _metaschema-json-id="/assembly/oscal-component-definition/component-definition/components"
                 name="defined-component"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:defined-component"
                 _step="component"
                 _key="components"
@@ -844,7 +844,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-implementation/component"
                 _metaschema-json-id="/assembly/oscal-ssp/system-implementation/components"
                 name="system-component"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:system-component"
                 _step="component"
                 _key="components"
@@ -872,7 +872,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/defined-component/responsible-role"
                 _metaschema-json-id="/assembly/oscal-component-definition/defined-component/responsible-roles"
                 name="responsible-role"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:responsible-role"
                 _step="responsible-role"
                 _key="responsible-roles"
@@ -894,7 +894,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/defined-component/protocol"
                 _metaschema-json-id="/assembly/oscal-component-definition/defined-component/protocols"
                 name="protocol"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:protocol"
                 _step="protocol"
                 _key="protocols"
@@ -916,7 +916,7 @@
                 _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/port-range"
                 _metaschema-json-id="/assembly/oscal-implementation-common/protocol/port-ranges"
                 name="port-range"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:port-range"
                 _step="port-range"
                 _key="port-ranges"
@@ -936,7 +936,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/control-implementation/set-parameter"
                 _metaschema-json-id="/assembly/oscal-component-definition/control-implementation/set-parameters"
                 name="set-parameter"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:set-parameter"
                 _step="set-parameter"
                 _key="set-parameters"
@@ -956,7 +956,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/component-definition/capability"
                 _metaschema-json-id="/assembly/oscal-component-definition/component-definition/capabilities"
                 name="capability"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:capability"
                 _step="capability"
                 _key="capabilities"
@@ -981,7 +981,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/capability/incorporates-component"
                 _metaschema-json-id="/assembly/oscal-component-definition/capability/incorporates-components"
                 name="incorporates-component"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:incorporates-component"
                 _step="incorporates-component"
                 _key="incorporates-components"
@@ -1001,7 +1001,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-security-plan"
                 name="system-security-plan"
                 key="system-security-plan"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:system-security-plan"
                 _using-root-name="system-security-plan"
                 gi="system-security-plan">
@@ -1027,7 +1027,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-security-plan/import-profile"
                 name="import-profile"
                 key="import-profile"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:import-profile"
                 _step="import-profile"
                 _key="import-profile"
@@ -1050,7 +1050,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-security-plan/system-characteristics"
                 name="system-characteristics"
                 key="system-characteristics"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:system-characteristics"
                 _step="system-characteristics"
                 _key="system-characteristics"
@@ -1087,7 +1087,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/system-information"
                 name="system-information"
                 key="system-information"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:system-information"
                 _step="system-information"
                 _key="system-information"
@@ -1111,7 +1111,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/security-impact-level"
                 name="security-impact-level"
                 key="security-impact-level"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:security-impact-level"
                 _step="security-impact-level"
                 _key="security-impact-level"
@@ -1135,7 +1135,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/authorization-boundary"
                 name="authorization-boundary"
                 key="authorization-boundary"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:authorization-boundary"
                 _step="authorization-boundary"
                 _key="authorization-boundary"
@@ -1160,7 +1160,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ssp/authorization-boundary/diagram"
                 _metaschema-json-id="/assembly/oscal-ssp/authorization-boundary/diagrams"
                 name="diagram"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:diagram"
                 _step="diagram"
                 _key="diagrams"
@@ -1184,7 +1184,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/network-architecture"
                 name="network-architecture"
                 key="network-architecture"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:network-architecture"
                 _step="network-architecture"
                 _key="network-architecture"
@@ -1210,7 +1210,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/data-flow"
                 name="data-flow"
                 key="data-flow"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:data-flow"
                 _step="data-flow"
                 _key="data-flow"
@@ -1236,7 +1236,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-security-plan/system-implementation"
                 name="system-implementation"
                 key="system-implementation"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:system-implementation"
                 _step="system-implementation"
                 _key="system-implementation"
@@ -1263,7 +1263,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-implementation/user"
                 _metaschema-json-id="/assembly/oscal-ssp/system-implementation/users"
                 name="system-user"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:system-user"
                 _step="user"
                 _key="users"
@@ -1289,7 +1289,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/authorized-privilege"
                 _metaschema-json-id="/assembly/oscal-implementation-common/system-user/authorized-privileges"
                 name="authorized-privilege"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:authorized-privilege"
                 _step="authorized-privilege"
                 _key="authorized-privileges"
@@ -1309,7 +1309,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-implementation/inventory-item"
                 _metaschema-json-id="/assembly/oscal-ssp/system-implementation/inventory-items"
                 name="inventory-item"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:inventory-item"
                 _step="inventory-item"
                 _key="inventory-items"
@@ -1333,7 +1333,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ssp/statement/by-component"
                 _metaschema-json-id="/assembly/oscal-ssp/statement/by-components"
                 name="by-component"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:by-component"
                 _step="by-component"
                 _key="by-components"
@@ -1363,7 +1363,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/by-component/implementation-status"
                 name="implementation-status"
                 key="implementation-status"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:implementation-status"
                 _step="implementation-status"
                 _key="implementation-status"
@@ -1386,7 +1386,7 @@
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan"
                 name="assessment-plan"
                 key="assessment-plan"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-plan_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-plan_metaschema.xml"
                 _key-name="oscal-ap:assessment-plan"
                 _using-root-name="assessment-plan"
                 gi="assessment-plan">
@@ -1415,7 +1415,7 @@
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan/import-ssp"
                 name="import-ssp"
                 key="import-ssp"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:import-ssp"
                 _step="import-ssp"
                 _key="import-ssp"
@@ -1437,7 +1437,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/local-definitions/objectives-and-methods"
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan/local-definitions/objectives-and-methods"
                 name="local-objective"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:local-objective"
                 _step="objectives-and-methods"
                 _key="objectives-and-methods"
@@ -1460,7 +1460,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/local-definitions/activity"
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan/local-definitions/activities"
                 name="activity"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:activity"
                 _step="activity"
                 _key="activities"
@@ -1487,7 +1487,7 @@
                 _metaschema-json-id="/assembly/oscal-assessment-common/activity/steps/reviewed-controls"
                 name="reviewed-controls"
                 key="reviewed-controls"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:reviewed-controls"
                 _step="reviewed-controls"
                 _key="reviewed-controls"
@@ -1514,7 +1514,7 @@
                 _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/include-objective"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/include-objectives"
                 name="select-objective-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-objective-by-id"
                 _step="include-objective"
                 _key="include-objectives"
@@ -1533,7 +1533,7 @@
                 _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selection/exclude-objective"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-objective-selections/exclude-objectives"
                 name="select-objective-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-objective-by-id"
                 _step="exclude-objective"
                 _key="exclude-objectives"
@@ -1552,7 +1552,7 @@
                 _metaschema-json-id="/assembly/oscal-assessment-common/activity/related-controls"
                 name="reviewed-controls"
                 key="related-controls"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:reviewed-controls"
                 _step="related-controls"
                 _key="related-controls"
@@ -1578,7 +1578,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/assessment-subject"
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan/assessment-subjects"
                 name="assessment-subject"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:assessment-subject"
                 _step="assessment-subject"
                 _key="assessment-subjects"
@@ -1603,7 +1603,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-subjects"
                 name="select-subject-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-subject-by-id"
                 _step="include-subject"
                 _key="include-subjects"
@@ -1625,7 +1625,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/exclude-subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/exclude-subjects"
                 name="select-subject-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-subject-by-id"
                 _step="exclude-subject"
                 _key="exclude-subjects"
@@ -1648,7 +1648,7 @@
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan/assessment-assets"
                 name="assessment-assets"
                 key="assessment-assets"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:assessment-assets"
                 _step="assessment-assets"
                 _key="assessment-assets"
@@ -1670,7 +1670,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ap/assessment-plan/task"
                 _metaschema-json-id="/assembly/oscal-ap/assessment-plan/tasks"
                 name="task"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:task"
                 _step="task"
                 _key="tasks"
@@ -1700,7 +1700,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/task/associated-activity/subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/task/associated-activities/subjects"
                 name="assessment-subject"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:assessment-subject"
                 _step="subject"
                 _key="subjects"
@@ -1726,7 +1726,7 @@
                 _metaschema-json-id="/assembly/oscal-ar/assessment-results"
                 name="assessment-results"
                 key="assessment-results"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-results_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-results_metaschema.xml"
                 _key-name="oscal-ar:assessment-results"
                 _using-root-name="assessment-results"
                 gi="assessment-results">
@@ -1751,7 +1751,7 @@
                 _metaschema-json-id="/assembly/oscal-ar/assessment-results/import-ap"
                 name="import-ap"
                 key="import-ap"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-results_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-results_metaschema.xml"
                 _key-name="oscal-ar:import-ap"
                 _step="import-ap"
                 _key="import-ap"
@@ -1773,7 +1773,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ar/assessment-results/result"
                 _metaschema-json-id="/assembly/oscal-ar/assessment-results/results"
                 name="result"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-results_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-results_metaschema.xml"
                 _key-name="oscal-ar:result"
                 _step="result"
                 _key="results"
@@ -1805,7 +1805,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ar/result/local-definitions/assessment-task"
                 _metaschema-json-id="/assembly/oscal-ar/result/local-definitions/tasks"
                 name="task"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:task"
                 _step="assessment-task"
                 _key="tasks"
@@ -1836,7 +1836,7 @@
                 _metaschema-xml-id="/assembly/oscal-ar/result/assessment-log/entry/logged-by"
                 _metaschema-json-id="/assembly/oscal-ar/result/assessment-log/entries/logged-by"
                 name="logged-by"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:logged-by"
                 _step="logged-by"
                 _key="logged-by"
@@ -1855,7 +1855,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ar/result/assessment-log/entry/related-task"
                 _metaschema-json-id="/assembly/oscal-ar/result/assessment-log/entries/related-tasks"
                 name="related-task"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:related-task"
                 _step="related-task"
                 _key="related-tasks"
@@ -1879,7 +1879,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ar/result/observation"
                 _metaschema-json-id="/assembly/oscal-ar/result/observations"
                 name="observation"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:observation"
                 _step="observation"
                 _key="observations"
@@ -1909,7 +1909,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/observation/origin"
                 _metaschema-json-id="/assembly/oscal-assessment-common/observation/origins"
                 name="origin"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:origin"
                 _step="origin"
                 _key="origins"
@@ -1931,7 +1931,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/origin/actor"
                 _metaschema-json-id="/assembly/oscal-assessment-common/origin/actors"
                 name="origin-actor"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:origin-actor"
                 _step="actor"
                 _key="actors"
@@ -1953,7 +1953,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ar/result/risk"
                 _metaschema-json-id="/assembly/oscal-ar/result/risks"
                 name="risk"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:risk"
                 _step="risk"
                 _key="risks"
@@ -1985,7 +1985,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/risk/characterization"
                 _metaschema-json-id="/assembly/oscal-assessment-common/risk/characterizations"
                 name="characterization"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:characterization"
                 _step="characterization"
                 _key="characterizations"
@@ -2006,7 +2006,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ar/result/finding"
                 _metaschema-json-id="/assembly/oscal-ar/result/findings"
                 name="finding"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-results_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-results_metaschema.xml"
                 _key-name="oscal-ar:finding"
                 _step="finding"
                 _key="findings"
@@ -2035,7 +2035,7 @@
                 _metaschema-json-id="/assembly/oscal-ar/finding/target"
                 name="finding-target"
                 key="target"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:finding-target"
                 _step="target"
                 _key="target"
@@ -2054,7 +2054,6 @@
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
          <xsl:apply-templates select="*[@key='status']"/>
-         <xsl:apply-templates select="*[@key='reason']"/>
          <xsl:apply-templates select="*[@key='implementation-status']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
@@ -2066,7 +2065,7 @@
                 _metaschema-json-id="/assembly/oscal-poam/plan-of-action-and-milestones"
                 name="plan-of-action-and-milestones"
                 key="plan-of-action-and-milestones"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_poam_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_poam_metaschema.xml"
                 _key-name="oscal-poam:plan-of-action-and-milestones"
                 _using-root-name="plan-of-action-and-milestones"
                 gi="plan-of-action-and-milestones">
@@ -2094,7 +2093,7 @@
                 _metaschema-json-id="/assembly/oscal-poam/plan-of-action-and-milestones/local-definitions"
                 name="local-definitions"
                 key="local-definitions"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_poam_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_poam_metaschema.xml"
                 _key-name="oscal-poam:local-definitions"
                 _step="local-definitions"
                 _key="local-definitions"
@@ -2117,7 +2116,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-poam/plan-of-action-and-milestones/poam-item"
                 _metaschema-json-id="/assembly/oscal-poam/plan-of-action-and-milestones/poam-items"
                 name="poam-item"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_poam_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_poam_metaschema.xml"
                 _key-name="oscal-poam:poam-item"
                 _step="poam-item"
                 _key="poam-items"
@@ -2137,7 +2136,7 @@
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:[@key='remarks']">
+   <xsl:template match="j:string[@key='remarks']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="remarks" -->
       <field _metaschema-xml-id="/assembly/oscal-metadata/property/remarks"
@@ -2147,7 +2146,7 @@
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:remarks"
              _step="remarks"
              _key="remarks"
@@ -2160,14 +2159,17 @@
          <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:[@key='remarks']" mode="get-value-property" priority="8">
-      <value>
+   <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:">
+   <xsl:template match="j:array[@key='location-uuids']/j:string">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="location-uuid" -->
       <field _metaschema-xml-id="/assembly/oscal-metadata/party/location-uuid"
@@ -2175,7 +2177,7 @@
              collapsible="no"
              as-type="uuid"
              name="location-uuid"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:location-uuid"
              _step="location-uuid"
              _key="location-uuids"
@@ -2184,16 +2186,18 @@
              _in-xml-name="location-uuid"
              _in-json-name="location-uuids"
              gi="location-uuid"
-             in-json="SCALAR"/>
+             in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="j:array[@key='location-uuids']/j:"
+   <xsl:template match="j:array[@key='location-uuids']/j:string"
                  mode="get-value-property"
                  priority="8">
-      <value>
+      <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="(j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:[@key='party-uuid'] | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:string[@key='party-uuid'] | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:string[@key='party-uuid'] | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:string[@key='party-uuid'] | j:array[@key='party-uuids']/j:)">
+   <xsl:template match="(j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:string[@key='party-uuid'] | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:string[@key='party-uuid'] | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:string[@key='party-uuid'] | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:string[@key='party-uuid'] | j:array[@key='party-uuids']/j:string)">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="party-uuid" -->
       <field _metaschema-xml-id="/assembly/oscal-metadata/responsible-party/party-uuid"
@@ -2201,7 +2205,7 @@
              collapsible="no"
              as-type="uuid"
              name="party-uuid"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:party-uuid"
              _step="party-uuid"
              _key="party-uuids"
@@ -2210,16 +2214,18 @@
              _in-xml-name="party-uuid"
              _in-json-name="party-uuids"
              gi="party-uuid"
-             in-json="SCALAR"/>
+             in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="(j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:[@key='party-uuid'] | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:string[@key='party-uuid'] | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:string[@key='party-uuid'] | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:string[@key='party-uuid'] | j:array[@key='party-uuids']/j:)"
+   <xsl:template match="(j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:string[@key='party-uuid'] | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:string[@key='party-uuid'] | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:string[@key='party-uuid'] | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:string[@key='party-uuid'] | j:array[@key='party-uuids']/j:string)"
                  mode="get-value-property"
                  priority="7">
-      <value>
+      <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="(j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'])">
+   <xsl:template match="(j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'])">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="value" -->
       <field _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/value"
@@ -2227,7 +2233,7 @@
              collapsible="no"
              as-type="string"
              name="parameter-value"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
              _key-name="oscal-catalog-common:parameter-value"
              _step="value"
              _key="values"
@@ -2236,12 +2242,14 @@
              _in-xml-name="value"
              _in-json-name="values"
              gi="value"
-             in-json="SCALAR"/>
+             in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="(j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'])"
+   <xsl:template match="(j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'])"
                  mode="get-value-property"
                  priority="7">
-      <value>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -2253,7 +2261,7 @@
              collapsible="no"
              as-type="string"
              name="hash"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:hash"
              _step="hash"
              _key="hashes"
@@ -2272,7 +2280,7 @@
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
-   <xsl:template match="j:[@key='as-is']">
+   <xsl:template match="j:boolean[@key='as-is']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="as-is" -->
       <field _metaschema-xml-id="/assembly/oscal-profile/merge/as-is"
@@ -2281,7 +2289,7 @@
              as-type="boolean"
              name="as-is"
              key="as-is"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
              _key-name="oscal-profile:as-is"
              _step="as-is"
              _key="as-is"
@@ -2294,10 +2302,13 @@
          <xsl:if test="$with-key">
             <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:[@key='as-is']" mode="get-value-property" priority="5">
-      <value>
+   <xsl:template match="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>
@@ -2309,7 +2320,7 @@
              collapsible="no"
              as-type="string"
              name="system-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
              _key-name="oscal-implementation-common:system-id"
              _step="system-id"
              _key="system-ids"
@@ -2332,7 +2343,7 @@
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
-   <xsl:template match="(j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:array[@key='role-ids']/j: | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:array[@key='role-ids']/j: | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:array[@key='role-ids']/j: | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'])">
+   <xsl:template match="(j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:array[@key='role-ids']/j:string | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:array[@key='role-ids']/j:string | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:array[@key='role-ids']/j:string | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'])">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="role-id" -->
       <field _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/role-id"
@@ -2340,7 +2351,7 @@
              collapsible="no"
              as-type="token"
              name="role-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:role-id"
              _step="role-id"
              _key="role-ids"
@@ -2349,16 +2360,18 @@
              _in-xml-name="role-id"
              _in-json-name="role-ids"
              gi="role-id"
-             in-json="SCALAR"/>
+             in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="(j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:array[@key='role-ids']/j: | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:array[@key='role-ids']/j: | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:array[@key='role-ids']/j: | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'])"
+   <xsl:template match="(j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:array[@key='role-ids']/j:string | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:array[@key='role-ids']/j:string | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:array[@key='role-ids']/j:string | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'])"
                  mode="get-value-property"
                  priority="7">
-      <value>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:array[@key='functions-performed']/j:">
+   <xsl:template match="j:array[@key='functions-performed']/j:string">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="function-performed" -->
       <field _metaschema-xml-id="/assembly/oscal-implementation-common/authorized-privilege/function-performed"
@@ -2366,7 +2379,7 @@
              collapsible="no"
              as-type="string"
              name="function-performed"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
              _key-name="oscal-implementation-common:function-performed"
              _step="function-performed"
              _key="functions-performed"
@@ -2375,12 +2388,14 @@
              _in-xml-name="function-performed"
              _in-json-name="functions-performed"
              gi="function-performed"
-             in-json="SCALAR"/>
+             in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="j:array[@key='functions-performed']/j:"
+   <xsl:template match="j:array[@key='functions-performed']/j:string"
                  mode="get-value-property"
                  priority="9">
-      <value>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -2392,7 +2407,7 @@
              collapsible="no"
              as-type="uri"
              name="threat-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
              _key-name="oscal-assessment-common:threat-id"
              _step="threat-id"
              _key="threat-ids"
@@ -2412,7 +2427,7 @@
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
-   <xsl:template match="j:[@key='status-change']">
+   <xsl:template match="j:string[@key='status-change']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="status-change" -->
       <field _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/status-change"
@@ -2421,7 +2436,7 @@
              as-type="token"
              name="risk-status"
              key="status-change"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
              _key-name="oscal-assessment-common:risk-status"
              _step="status-change"
              _key="status-change"
@@ -2434,12 +2449,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status-change</xsl:attribute>
          </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:[@key='status-change']"
+   <xsl:template match="j:string[@key='status-change']"
                  mode="get-value-property"
                  priority="10">
-      <value>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -2602,7 +2618,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/link/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -2682,7 +2698,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/address/type"
             name="location-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:location-type"
             _step="type"
             _key="type"
@@ -2839,7 +2855,7 @@
             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/depends-on"
             name="depends-on"
             key="depends-on"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
             _key-name="oscal-catalog-common:depends-on"
             _step="depends-on"
             _key="depends-on"
@@ -3072,7 +3088,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -3133,7 +3149,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -3193,7 +3209,7 @@
             _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/with-child-controls"
             name="with-child-controls"
             key="with-child-controls"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
             _key-name="oscal-profile:with-child-controls"
             _step="with-child-controls"
             _key="with-child-controls"
@@ -3215,7 +3231,7 @@
             _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/matching/pattern"
             name="pattern"
             key="pattern"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
             _key-name="oscal-profile:pattern"
             _step="pattern"
             _key="pattern"
@@ -3237,7 +3253,7 @@
             _metaschema-json-id="/assembly/oscal-profile/combine/method"
             name="method"
             key="method"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
             _key-name="oscal-profile:method"
             _step="method"
             _key="method"
@@ -3356,7 +3372,7 @@
             _metaschema-json-id="/assembly/oscal-profile/modify/set-parameters/depends-on"
             name="depends-on"
             key="depends-on"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
             _key-name="oscal-catalog-common:depends-on"
             _step="depends-on"
             _key="depends-on"
@@ -3378,7 +3394,7 @@
             _metaschema-json-id="/assembly/oscal-profile/alter/control-id"
             name="control-id"
             key="control-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
             _key-name="oscal-catalog-common:control-id"
             _step="control-id"
             _key="control-id"
@@ -3590,7 +3606,7 @@
             _metaschema-json-id="/assembly/oscal-component-definition/defined-component/type"
             name="defined-component-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
             _key-name="oscal-component-definition:defined-component-type"
             _step="type"
             _key="type"
@@ -3746,7 +3762,7 @@
             _metaschema-json-id="/assembly/oscal-component-definition/control-implementation/source"
             name="source"
             key="source"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
             _key-name="oscal-implementation-common:source"
             _step="source"
             _key="source"
@@ -3768,7 +3784,7 @@
             _metaschema-json-id="/assembly/oscal-implementation-common/set-parameter/param-id"
             name="param-id"
             key="param-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
             _key-name="oscal-implementation-common:param-id"
             _step="param-id"
             _key="param-id"
@@ -3810,7 +3826,7 @@
             _metaschema-json-id="/assembly/oscal-component-definition/implemented-requirement/control-id"
             name="control-id"
             key="control-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
             _key-name="oscal-catalog-common:control-id"
             _step="control-id"
             _key="control-id"
@@ -3832,7 +3848,7 @@
             _metaschema-json-id="/assembly/oscal-component-definition/statement/statement-id"
             name="statement-id"
             key="statement-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
             _key-name="oscal-implementation-common:statement-id"
             _step="statement-id"
             _key="statement-id"
@@ -4125,7 +4141,7 @@
             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/type"
             name="system-component-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
             _key-name="oscal-implementation-common:system-component-type"
             _step="type"
             _key="type"
@@ -4226,7 +4242,7 @@
             _metaschema-json-id="/assembly/oscal-ssp/implemented-requirement/control-id"
             name="control-id"
             key="control-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
             _key-name="oscal-catalog-common:control-id"
             _step="control-id"
             _key="control-id"
@@ -4248,7 +4264,7 @@
             _metaschema-json-id="/assembly/oscal-ssp/statement/statement-id"
             name="statement-id"
             key="statement-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
             _key-name="oscal-implementation-common:statement-id"
             _step="statement-id"
             _key="statement-id"
@@ -4387,7 +4403,7 @@
             _metaschema-json-id="/assembly/oscal-ssp/by-component/export/responsibilities/provided-uuid"
             name="provided-uuid"
             key="provided-uuid"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
             _key-name="oscal-ssp:provided-uuid"
             _step="provided-uuid"
             _key="provided-uuid"
@@ -4429,7 +4445,7 @@
             _metaschema-json-id="/assembly/oscal-ssp/by-component/inherited/provided-uuid"
             name="provided-uuid"
             key="provided-uuid"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
             _key-name="oscal-ssp:provided-uuid"
             _step="provided-uuid"
             _key="provided-uuid"
@@ -4471,7 +4487,7 @@
             _metaschema-json-id="/assembly/oscal-ssp/by-component/satisfied/responsibility-uuid"
             name="responsibility-uuid"
             key="responsibility-uuid"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
             _key-name="oscal-ssp:responsibility-uuid"
             _step="responsibility-uuid"
             _key="responsibility-uuid"
@@ -4531,7 +4547,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/local-objective/control-id"
             name="control-id"
             key="control-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
             _key-name="oscal-catalog-common:control-id"
             _step="control-id"
             _key="control-id"
@@ -4592,7 +4608,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/select-control-by-id/control-id"
             name="control-id"
             key="control-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
             _key-name="oscal-catalog-common:control-id"
             _step="control-id"
             _key="control-id"
@@ -4614,7 +4630,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/select-objective-by-id/objective-id"
             name="objective-id"
             key="objective-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
             _key-name="oscal-assessment-common:objective-id"
             _step="objective-id"
             _key="objective-id"
@@ -4731,7 +4747,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/select-subject-by-id/subject-uuid"
             name="subject-uuid"
             key="subject-uuid"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
             _key-name="oscal-assessment-common:subject-uuid"
             _step="subject-uuid"
             _key="subject-uuid"
@@ -4753,7 +4769,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/select-subject-by-id/type"
             name="subject-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
             _key-name="oscal-assessment-common:subject-type"
             _step="type"
             _key="type"
@@ -5223,7 +5239,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/subject-reference/subject-uuid"
             name="subject-uuid"
             key="subject-uuid"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
             _key-name="oscal-assessment-common:subject-uuid"
             _step="subject-uuid"
             _key="subject-uuid"
@@ -5245,7 +5261,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/subject-reference/type"
             name="subject-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
             _key-name="oscal-assessment-common:subject-type"
             _step="type"
             _key="type"
@@ -5614,6 +5630,46 @@
    <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" -->
+      <flag in-json="string"
+            as-type="token"
+            _step="state"
+            _key="state"
+            _metaschema-xml-id="/assembly/oscal-assessment-common/finding-target/status/state"
+            _metaschema-json-id="/assembly/oscal-assessment-common/finding-target/status/state"
+            name="state"
+            key="state"
+            _using-name="state"
+            _in-xml-name="state"
+            _in-json-name="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" -->
+      <flag in-json="string"
+            as-type="token"
+            _step="reason"
+            _key="reason"
+            _metaschema-xml-id="/assembly/oscal-assessment-common/finding-target/status/reason"
+            _metaschema-json-id="/assembly/oscal-assessment-common/finding-target/status/reason"
+            name="reason"
+            key="reason"
+            _using-name="reason"
+            _in-xml-name="reason"
+            _in-json-name="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" -->
       <flag in-json="string"
@@ -5732,7 +5788,7 @@
    <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>
-   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:[@key='title']"
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:string[@key='title']"
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/title" -->
@@ -5752,16 +5808,17 @@
          <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='catalog']/j:map[@key='metadata']/j:[@key='title']"
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:string[@key='title']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='published']"
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:string[@key='published']"
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/published" -->
@@ -5771,7 +5828,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -5784,16 +5841,17 @@
          <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='catalog']/j:map[@key='metadata']/j:[@key='published']"
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:string[@key='published']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='last-modified']"
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:string[@key='last-modified']"
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/last-modified" -->
@@ -5803,7 +5861,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -5816,16 +5874,17 @@
          <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='catalog']/j:map[@key='metadata']/j:[@key='last-modified']"
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:string[@key='last-modified']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='version']"
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:string[@key='version']"
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/version" -->
@@ -5835,7 +5894,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -5848,16 +5907,17 @@
          <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='catalog']/j:map[@key='metadata']/j:[@key='version']"
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:string[@key='version']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='oscal-version']"
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:string[@key='oscal-version']"
                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/oscal-version" -->
@@ -5867,7 +5927,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -5880,12 +5940,13 @@
          <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='catalog']/j:map[@key='metadata']/j:[@key='oscal-version']"
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:string[@key='oscal-version']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -5896,7 +5957,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/revisions/revision"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/revisions"
                 name="revision"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:revision"
                 _step="revisions/revision"
                 _key="revisions"
@@ -5924,7 +5985,7 @@
              group-json="ARRAY"
              name="revision"
              key="revisions"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:revision"
              _key-ref="oscal-metadata:revision">
          <xsl:if test="$with-key">
@@ -5933,7 +5994,7 @@
          <xsl:apply-templates select="*"/>
       </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:[@key='title']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions/revision/title" -->
@@ -5953,16 +6014,17 @@
          <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='catalog']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='title']"
+   <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">
-      <value>
+      <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:[@key='published']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions/revision/published" -->
@@ -5972,7 +6034,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -5985,16 +6047,17 @@
          <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='catalog']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='published']"
+   <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">
-      <value>
+      <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:[@key='last-modified']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions/revision/last-modified" -->
@@ -6004,7 +6067,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -6017,16 +6080,17 @@
          <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='catalog']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='last-modified']"
+   <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">
-      <value>
+      <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:[@key='version']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions/revision/version" -->
@@ -6036,7 +6100,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -6049,16 +6113,17 @@
          <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='catalog']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='version']"
+   <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">
-      <value>
+      <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:[@key='oscal-version']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions/revision/oscal-version" -->
@@ -6068,7 +6133,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -6081,16 +6146,17 @@
          <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='catalog']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='oscal-version']"
+   <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">
-      <value>
+      <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:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions/revision/link/text" -->
@@ -6110,12 +6176,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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">
-      <value>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -6128,7 +6195,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -6148,7 +6215,7 @@
          <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:[@key='text']"
+   <xsl:template match="j:map[@key='catalog']/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="catalog/metadata/link/text" -->
@@ -6168,16 +6235,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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">
-      <value>
+      <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:[@key='title']"
+   <xsl:template match="j:map[@key='catalog']/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="catalog/metadata/role/title" -->
@@ -6197,16 +6265,17 @@
          <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='catalog']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:[@key='title']"
+   <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">
-      <value>
+      <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:[@key='short-name']"
+   <xsl:template match="j:map[@key='catalog']/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="catalog/metadata/role/short-name" -->
@@ -6226,16 +6295,17 @@
          <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='catalog']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:[@key='short-name']"
+   <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">
-      <value>
+      <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:[@key='description']"
+   <xsl:template match="j:map[@key='catalog']/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="catalog/metadata/role/description" -->
@@ -6256,16 +6326,17 @@
          <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='catalog']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:[@key='description']"
+   <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">
-      <value>
+      <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:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/role/link/text" -->
@@ -6285,16 +6356,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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">
-      <value>
+      <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:[@key='title']"
+   <xsl:template match="j:map[@key='catalog']/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="catalog/metadata/location/title" -->
@@ -6314,12 +6386,13 @@
          <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='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:[@key='title']"
+   <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">
-      <value>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -6331,7 +6404,7 @@
                 _metaschema-json-id="/assembly/oscal-metadata/location/address"
                 name="address"
                 key="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="address"
@@ -6351,7 +6424,7 @@
          <xsl:apply-templates select="*[@key='country']"/>
       </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:"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/address/addr-line" -->
@@ -6360,7 +6433,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -6369,16 +6442,18 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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:"
+   <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">
-      <value>
+      <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:[@key='city']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/address/city" -->
@@ -6398,16 +6473,17 @@
          <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='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:[@key='city']"
+   <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">
-      <value>
+      <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:[@key='state']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/address/state" -->
@@ -6427,16 +6503,17 @@
          <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='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:[@key='state']"
+   <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">
-      <value>
+      <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:[@key='postal-code']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/address/postal-code" -->
@@ -6456,16 +6533,17 @@
          <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='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:[@key='postal-code']"
+   <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">
-      <value>
+      <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:[@key='country']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/address/country" -->
@@ -6485,16 +6563,17 @@
          <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='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:[@key='country']"
+   <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">
-      <value>
+      <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:"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/email-address" -->
@@ -6503,7 +6582,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -6512,12 +6591,14 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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:"
+   <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">
-      <value>
+      <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -6530,7 +6611,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -6550,7 +6631,7 @@
          <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:"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/url" -->
@@ -6565,16 +6646,18 @@
              _in-xml-name="url"
              _in-json-name="urls"
              gi="url"
-             in-json="SCALAR"/>
+             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:"
+   <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">
-      <value>
+      <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:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/link/text" -->
@@ -6594,16 +6677,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='locations']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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">
-      <value>
+      <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:[@key='name']"
+   <xsl:template match="j:map[@key='catalog']/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="catalog/metadata/party/name" -->
@@ -6623,16 +6707,17 @@
          <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='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:[@key='name']"
+   <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">
-      <value>
+      <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:[@key='short-name']"
+   <xsl:template match="j:map[@key='catalog']/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="catalog/metadata/party/short-name" -->
@@ -6652,12 +6737,13 @@
          <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='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:[@key='short-name']"
+   <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">
-      <value>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -6687,7 +6773,7 @@
          <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:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/link/text" -->
@@ -6707,16 +6793,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='parties']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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">
-      <value>
+      <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:"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/email-address" -->
@@ -6725,7 +6812,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -6734,12 +6821,14 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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:"
+   <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">
-      <value>
+      <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -6752,7 +6841,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -6779,7 +6868,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/party/address"
                 _metaschema-json-id="/assembly/oscal-metadata/party/addresses"
                 name="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="addresses"
@@ -6796,7 +6885,7 @@
          <xsl:apply-templates select="*[@key='country']"/>
       </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:"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/address/addr-line" -->
@@ -6805,7 +6894,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -6814,16 +6903,18 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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:"
+   <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">
-      <value>
+      <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:[@key='city']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/address/city" -->
@@ -6843,16 +6934,17 @@
          <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='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:[@key='city']"
+   <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">
-      <value>
+      <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:[@key='state']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/address/state" -->
@@ -6872,16 +6964,17 @@
          <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='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:[@key='state']"
+   <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">
-      <value>
+      <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:[@key='postal-code']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/address/postal-code" -->
@@ -6901,16 +6994,17 @@
          <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='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:[@key='postal-code']"
+   <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">
-      <value>
+      <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:[@key='country']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/address/country" -->
@@ -6930,16 +7024,17 @@
          <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='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:[@key='country']"
+   <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">
-      <value>
+      <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:"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/member-of-organization" -->
@@ -6954,16 +7049,18 @@
              _in-xml-name="member-of-organization"
              _in-json-name="member-of-organizations"
              gi="member-of-organization"
-             in-json="SCALAR"/>
+             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:"
+   <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">
-      <value>
+      <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:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/responsible-party/link/text" -->
@@ -6983,16 +7080,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-parties']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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">
-      <value>
+      <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:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/param/link/text" -->
@@ -7012,16 +7110,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='params']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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">
-      <value>
+      <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:[@key='label']"
+   <xsl:template match="j:map[@key='catalog']/j:array[@key='params']/j:map/j:string[@key='label']"
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/param/label" -->
@@ -7041,16 +7140,17 @@
          <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='catalog']/j:array[@key='params']/j:map/j:[@key='label']"
+   <xsl:template match="j:map[@key='catalog']/j:array[@key='params']/j:map/j:string[@key='label']"
                  mode="get-value-property"
                  priority="5">
-      <value>
+      <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:[@key='usage']"
+   <xsl:template match="j:map[@key='catalog']/j:array[@key='params']/j:map/j:string[@key='usage']"
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/param/usage" -->
@@ -7071,16 +7171,17 @@
          <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='catalog']/j:array[@key='params']/j:map/j:[@key='usage']"
+   <xsl:template match="j:map[@key='catalog']/j:array[@key='params']/j:map/j:string[@key='usage']"
                  mode="get-value-property"
                  priority="5">
-      <value>
+      <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:[@key='description']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/param/constraint/description" -->
@@ -7101,12 +7202,13 @@
          <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='catalog']/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:[@key='description']"
+   <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">
-      <value>
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -7127,7 +7229,7 @@
          <xsl:apply-templates select="*[@key='remarks']"/>
       </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:[@key='expression']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/param/constraint/test/expression" -->
@@ -7147,20 +7249,21 @@
          <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='catalog']/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map/j:[@key='expression']"
+   <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">
-      <value>
+      <value as-type="string" 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='guidelines']/j:map"
-                 priority="7">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="catalog/param/guideline" -->
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+   <!-- 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']">
+      <field scope="local"
+             _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _key="prose"
              _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
              _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
@@ -7171,21 +7274,16 @@
              key="prose"
              _using-name="prose"
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+             _in-json-name="prose">
+         <value as-type="markup-multiline"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6/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='catalog']/j:array[@key='params']/j:map/j:array[@key='guidelines']/j:map"
-                 mode="get-value-property"
-                 priority="7">
-      <value>
-         <xsl:value-of select="."/>
-      </value>
-   </xsl:template>
-   <xsl:template match="j:map[@key='catalog']/j:array[@key='params']/j:map/j:map[@key='select']/j:array[@key='choice']/j:"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/param/select/choice" -->
@@ -7200,16 +7298,18 @@
              _in-xml-name="choice"
              _in-json-name="choice"
              gi="choice"
-             in-json="SCALAR"/>
+             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:"
+   <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">
-      <value>
+      <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:[@key='title']"
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:string[@key='title']"
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/title" -->
@@ -7229,16 +7329,17 @@
          <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='catalog']//j:array[@key='controls']/j:map/j:[@key='title']"
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:string[@key='title']"
                  mode="get-value-property"
                  priority="5">
-      <value>
+      <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:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/param/link/text" -->
@@ -7258,16 +7359,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:array[@key='params']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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">
-      <value>
+      <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:[@key='label']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/param/label" -->
@@ -7287,16 +7389,17 @@
          <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='catalog']//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:[@key='label']"
+   <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">
-      <value>
+      <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:[@key='usage']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/param/usage" -->
@@ -7317,16 +7420,17 @@
          <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='catalog']//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:[@key='usage']"
+   <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">
-      <value>
+      <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:[@key='description']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/param/constraint/description" -->
@@ -7347,12 +7451,13 @@
          <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='catalog']//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:[@key='description']"
+   <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">
-      <value>
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -7373,7 +7478,7 @@
          <xsl:apply-templates select="*[@key='remarks']"/>
       </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:[@key='expression']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/param/constraint/test/expression" -->
@@ -7393,20 +7498,21 @@
          <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='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:[@key='expression']"
+   <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">
-      <value>
+      <value as-type="string" 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='guidelines']/j:map"
-                 priority="9">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="catalog//control/param/guideline" -->
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+   <!-- 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']">
+      <field scope="local"
+             _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _key="prose"
              _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
              _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
@@ -7417,21 +7523,16 @@
              key="prose"
              _using-name="prose"
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+             _in-json-name="prose">
+         <value as-type="markup-multiline"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6/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='catalog']//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:array[@key='guidelines']/j:map"
-                 mode="get-value-property"
-                 priority="9">
-      <value>
-         <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:map[@key='select']/j:array[@key='choice']/j:"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/param/select/choice" -->
@@ -7446,16 +7547,18 @@
              _in-xml-name="choice"
              _in-json-name="choice"
              gi="choice"
-             in-json="SCALAR"/>
+             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:"
+   <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">
-      <value>
+      <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:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/link/text" -->
@@ -7475,16 +7578,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:array[@key='links']/j:map/j:[@key='text']"
+   <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">
-      <value>
+      <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:[@key='title']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control//part/title" -->
@@ -7504,20 +7608,21 @@
          <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='catalog']//j:array[@key='controls']/j:map//j:array[@key='parts']/j:map/j:[@key='title']"
+   <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">
-      <value>
+      <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"
-                 priority="7">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="catalog//control//part" -->
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+   <!-- 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']">
+      <field scope="local"
+             _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _key="prose"
              _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
              _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
@@ -7528,21 +7633,16 @@
              key="prose"
              _using-name="prose"
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+             _in-json-name="prose">
+         <value as-type="markup-multiline"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6/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='catalog']//j:array[@key='controls']/j:map//j:array[@key='parts']/j:map"
-                 mode="get-value-property"
-                 priority="7">
-      <value>
-         <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:array[@key='links']/j:map/j:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control//part/link/text" -->
@@ -7562,16 +7662,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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">
-      <value>
+      <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:[@key='title']"
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:string[@key='title']"
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/title" -->
@@ -7591,16 +7692,17 @@
          <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='catalog']//j:array[@key='groups']/j:map/j:[@key='title']"
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:string[@key='title']"
                  mode="get-value-property"
                  priority="5">
-      <value>
+      <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:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/param/link/text" -->
@@ -7620,16 +7722,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='params']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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">
-      <value>
+      <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:[@key='label']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/param/label" -->
@@ -7649,16 +7752,17 @@
          <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='catalog']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:[@key='label']"
+   <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">
-      <value>
+      <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:[@key='usage']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/param/usage" -->
@@ -7679,16 +7783,17 @@
          <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='catalog']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:[@key='usage']"
+   <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">
-      <value>
+      <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:[@key='description']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/param/constraint/description" -->
@@ -7709,12 +7814,13 @@
          <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='catalog']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:[@key='description']"
+   <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">
-      <value>
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -7735,7 +7841,7 @@
          <xsl:apply-templates select="*[@key='remarks']"/>
       </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:[@key='expression']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/param/constraint/test/expression" -->
@@ -7755,20 +7861,21 @@
          <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='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:[@key='expression']"
+   <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">
-      <value>
+      <value as-type="string" 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='guidelines']/j:map"
-                 priority="9">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="catalog//group/param/guideline" -->
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+   <!-- 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']">
+      <field scope="local"
+             _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _key="prose"
              _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
              _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
@@ -7779,21 +7886,16 @@
              key="prose"
              _using-name="prose"
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+             _in-json-name="prose">
+         <value as-type="markup-multiline"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6/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='catalog']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='guidelines']/j:map"
-                 mode="get-value-property"
-                 priority="9">
-      <value>
-         <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:map[@key='select']/j:array[@key='choice']/j:"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/param/select/choice" -->
@@ -7808,16 +7910,18 @@
              _in-xml-name="choice"
              _in-json-name="choice"
              gi="choice"
-             in-json="SCALAR"/>
+             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:"
+   <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">
-      <value>
+      <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:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/link/text" -->
@@ -7837,16 +7941,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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">
-      <value>
+      <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:[@key='title']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//part/title" -->
@@ -7866,20 +7971,21 @@
          <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='catalog']//j:array[@key='groups']/j:map//j:array[@key='parts']/j:map/j:[@key='title']"
+   <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">
-      <value>
+      <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"
-                 priority="7">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="catalog//group//part" -->
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+   <!-- 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']">
+      <field scope="local"
+             _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _key="prose"
              _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
              _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
@@ -7890,21 +7996,16 @@
              key="prose"
              _using-name="prose"
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+             _in-json-name="prose">
+         <value as-type="markup-multiline"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6/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='catalog']//j:array[@key='groups']/j:map//j:array[@key='parts']/j:map"
-                 mode="get-value-property"
-                 priority="7">
-      <value>
-         <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:array[@key='links']/j:map/j:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//part/link/text" -->
@@ -7924,16 +8025,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='parts']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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">
-      <value>
+      <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:[@key='title']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/title" -->
@@ -7953,16 +8055,17 @@
          <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='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:[@key='title']"
+   <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">
-      <value>
+      <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:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/param/link/text" -->
@@ -7982,16 +8085,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:array[@key='params']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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">
-      <value>
+      <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:[@key='label']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/param/label" -->
@@ -8011,16 +8115,17 @@
          <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='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:[@key='label']"
+   <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">
-      <value>
+      <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:[@key='usage']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/param/usage" -->
@@ -8041,16 +8146,17 @@
          <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='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:[@key='usage']"
+   <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">
-      <value>
+      <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:[@key='description']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/param/constraint/description" -->
@@ -8071,12 +8177,13 @@
          <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='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:[@key='description']"
+   <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">
-      <value>
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -8097,7 +8204,7 @@
          <xsl:apply-templates select="*[@key='remarks']"/>
       </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:[@key='expression']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/param/constraint/test/expression" -->
@@ -8117,20 +8224,21 @@
          <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='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:[@key='expression']"
+   <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">
-      <value>
+      <value as-type="string" 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='guidelines']/j:map"
-                 priority="12">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="catalog//group//control/param/guideline" -->
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+   <!-- 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']">
+      <field scope="local"
+             _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _key="prose"
              _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
              _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
@@ -8141,21 +8249,16 @@
              key="prose"
              _using-name="prose"
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+             _in-json-name="prose">
+         <value as-type="markup-multiline"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6/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='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"
-                 mode="get-value-property"
-                 priority="12">
-      <value>
-         <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:map[@key='select']/j:array[@key='choice']/j:"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/param/select/choice" -->
@@ -8170,16 +8273,18 @@
              _in-xml-name="choice"
              _in-json-name="choice"
              gi="choice"
-             in-json="SCALAR"/>
+             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:"
+   <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">
-      <value>
+      <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:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/link/text" -->
@@ -8199,16 +8304,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:array[@key='links']/j:map/j:[@key='text']"
+   <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">
-      <value>
+      <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:[@key='title']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control//part/title" -->
@@ -8228,20 +8334,21 @@
          <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='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map//j:array[@key='parts']/j:map/j:[@key='title']"
+   <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">
-      <value>
+      <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"
-                 priority="10">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="catalog//group//control//part" -->
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+   <!-- 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']">
+      <field scope="local"
+             _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _key="prose"
              _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
              _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
@@ -8252,21 +8359,16 @@
              key="prose"
              _using-name="prose"
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+             _in-json-name="prose">
+         <value as-type="markup-multiline"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6/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='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map//j:array[@key='parts']/j:map"
-                 mode="get-value-property"
-                 priority="10">
-      <value>
-         <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:array[@key='links']/j:map/j:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control//part/link/text" -->
@@ -8286,12 +8388,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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">
-      <value>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -8319,7 +8422,7 @@
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:[@key='title']"
+   <xsl:template match="j:map[@key='catalog']/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="catalog/back-matter/resource/title" -->
@@ -8339,16 +8442,17 @@
          <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='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:[@key='title']"
+   <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">
-      <value>
+      <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:[@key='description']"
+   <xsl:template match="j:map[@key='catalog']/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="catalog/back-matter/resource/description" -->
@@ -8369,12 +8473,13 @@
          <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='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:[@key='description']"
+   <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">
-      <value>
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -8387,7 +8492,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -8429,7 +8534,7 @@
          <xsl:apply-templates select="*[@key='links']"/>
       </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:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/back-matter/resource/citation/text" -->
@@ -8449,16 +8554,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:[@key='text']"
+   <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">
-      <value>
+      <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:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/back-matter/resource/citation/link/text" -->
@@ -8478,12 +8584,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:[@key='text']"
+   <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">
-      <value>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -8536,7 +8643,7 @@
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:[@key='title']"
+   <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/metadata/title" -->
@@ -8556,16 +8663,17 @@
          <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:[@key='title']"
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:string[@key='title']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='published']"
+   <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/metadata/published" -->
@@ -8575,7 +8683,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -8588,16 +8696,17 @@
          <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:[@key='published']"
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:string[@key='published']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='last-modified']"
+   <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/metadata/last-modified" -->
@@ -8607,7 +8716,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -8620,16 +8729,17 @@
          <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:[@key='last-modified']"
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:string[@key='last-modified']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='version']"
+   <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/metadata/version" -->
@@ -8639,7 +8749,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -8652,16 +8762,17 @@
          <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:[@key='version']"
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:string[@key='version']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='oscal-version']"
+   <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/metadata/oscal-version" -->
@@ -8671,7 +8782,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -8684,12 +8795,13 @@
          <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:[@key='oscal-version']"
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:string[@key='oscal-version']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -8700,7 +8812,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/revisions/revision"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/revisions"
                 name="revision"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:revision"
                 _step="revisions/revision"
                 _key="revisions"
@@ -8728,7 +8840,7 @@
              group-json="ARRAY"
              name="revision"
              key="revisions"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:revision"
              _key-ref="oscal-metadata:revision">
          <xsl:if test="$with-key">
@@ -8737,7 +8849,7 @@
          <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:[@key='title']"
+   <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/metadata/revisions/revision/title" -->
@@ -8757,16 +8869,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='published']"
+   <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/metadata/revisions/revision/published" -->
@@ -8776,7 +8889,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -8789,16 +8902,17 @@
          <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:[@key='published']"
+   <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>
+      <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:[@key='last-modified']"
+   <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/metadata/revisions/revision/last-modified" -->
@@ -8808,7 +8922,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -8821,16 +8935,17 @@
          <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:[@key='last-modified']"
+   <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>
+      <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:[@key='version']"
+   <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/metadata/revisions/revision/version" -->
@@ -8840,7 +8955,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -8853,16 +8968,17 @@
          <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:[@key='version']"
+   <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>
+      <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:[@key='oscal-version']"
+   <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/metadata/revisions/revision/oscal-version" -->
@@ -8872,7 +8988,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -8885,16 +9001,17 @@
          <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:[@key='oscal-version']"
+   <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>
+      <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:[@key='text']"
+   <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/metadata/revisions/revision/link/text" -->
@@ -8914,12 +9031,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -8932,7 +9050,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -8952,7 +9070,7 @@
          <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:[@key='text']"
+   <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/metadata/link/text" -->
@@ -8972,16 +9090,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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/metadata/role/title" -->
@@ -9001,16 +9120,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='short-name']"
+   <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/metadata/role/short-name" -->
@@ -9030,16 +9150,17 @@
          <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:[@key='short-name']"
+   <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>
+      <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:[@key='description']"
+   <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/metadata/role/description" -->
@@ -9060,16 +9181,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/metadata/role/link/text" -->
@@ -9089,16 +9211,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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/metadata/location/title" -->
@@ -9118,12 +9241,13 @@
          <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:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -9135,7 +9259,7 @@
                 _metaschema-json-id="/assembly/oscal-metadata/location/address"
                 name="address"
                 key="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="address"
@@ -9155,7 +9279,7 @@
          <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:"
+   <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" -->
@@ -9164,7 +9288,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -9173,16 +9297,18 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='city']"
+   <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/metadata/location/address/city" -->
@@ -9202,16 +9328,17 @@
          <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:[@key='city']"
+   <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>
+      <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:[@key='state']"
+   <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/metadata/location/address/state" -->
@@ -9231,16 +9358,17 @@
          <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:[@key='state']"
+   <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>
+      <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:[@key='postal-code']"
+   <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/metadata/location/address/postal-code" -->
@@ -9260,16 +9388,17 @@
          <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:[@key='postal-code']"
+   <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>
+      <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:[@key='country']"
+   <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/metadata/location/address/country" -->
@@ -9289,16 +9418,17 @@
          <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:[@key='country']"
+   <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>
+      <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:"
+   <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/metadata/location/email-address" -->
@@ -9307,7 +9437,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -9316,12 +9446,14 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -9334,7 +9466,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -9354,7 +9486,7 @@
          <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:"
+   <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="profile/metadata/location/url" -->
@@ -9369,16 +9501,18 @@
              _in-xml-name="url"
              _in-json-name="urls"
              gi="url"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='text']"
+   <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="profile/metadata/location/link/text" -->
@@ -9398,16 +9532,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='name']"
+   <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" -->
@@ -9427,16 +9562,17 @@
          <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:[@key='name']"
+   <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>
+      <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:[@key='short-name']"
+   <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="profile/metadata/party/short-name" -->
@@ -9456,12 +9592,13 @@
          <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:[@key='short-name']"
+   <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>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -9491,7 +9628,7 @@
          <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:[@key='text']"
+   <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="profile/metadata/party/link/text" -->
@@ -9511,16 +9648,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:"
+   <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="profile/metadata/party/email-address" -->
@@ -9529,7 +9667,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -9538,12 +9676,14 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -9556,7 +9696,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -9583,7 +9723,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/party/address"
                 _metaschema-json-id="/assembly/oscal-metadata/party/addresses"
                 name="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="addresses"
@@ -9600,7 +9740,7 @@
          <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:"
+   <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" -->
@@ -9609,7 +9749,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -9618,16 +9758,18 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='city']"
+   <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="profile/metadata/party/address/city" -->
@@ -9647,16 +9789,17 @@
          <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:[@key='city']"
+   <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>
+      <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:[@key='state']"
+   <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="profile/metadata/party/address/state" -->
@@ -9676,16 +9819,17 @@
          <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:[@key='state']"
+   <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>
+      <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:[@key='postal-code']"
+   <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="profile/metadata/party/address/postal-code" -->
@@ -9705,16 +9849,17 @@
          <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:[@key='postal-code']"
+   <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>
+      <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:[@key='country']"
+   <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="profile/metadata/party/address/country" -->
@@ -9734,16 +9879,17 @@
          <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:[@key='country']"
+   <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>
+      <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:"
+   <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="profile/metadata/party/member-of-organization" -->
@@ -9758,16 +9904,18 @@
              _in-xml-name="member-of-organization"
              _in-json-name="member-of-organizations"
              gi="member-of-organization"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='text']"
+   <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="profile/metadata/responsible-party/link/text" -->
@@ -9787,12 +9935,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -9803,7 +9952,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/import/include-controls"
                 _metaschema-json-id="/assembly/oscal-profile/import/include-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:select-control-by-id"
                 _step="include-controls"
                 _key="include-controls"
@@ -9817,7 +9966,7 @@
          <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:"
+   <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:param name="with-key" select="true()"/>
       <!-- XML match="profile/import/include-controls/with-id" -->
@@ -9832,12 +9981,14 @@
              _in-xml-name="with-id"
              _in-json-name="with-ids"
              gi="with-id"
-             in-json="SCALAR"/>
+             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='include-controls']/j:map/j:array[@key='with-ids']/j:"
+   <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>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -9865,7 +10016,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/import/exclude-controls"
                 _metaschema-json-id="/assembly/oscal-profile/import/exclude-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:select-control-by-id"
                 _step="exclude-controls"
                 _key="exclude-controls"
@@ -9879,7 +10030,7 @@
          <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:"
+   <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" -->
@@ -9894,12 +10045,14 @@
              _in-xml-name="with-id"
              _in-json-name="with-ids"
              gi="with-id"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -9920,7 +10073,7 @@
          <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:[@key='title']"
+   <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="profile/merge/custom//group/title" -->
@@ -9940,16 +10093,17 @@
          <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='groups']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='text']"
+   <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="profile/merge/custom//group/param/link/text" -->
@@ -9969,16 +10123,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='label']"
+   <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="profile/merge/custom//group/param/label" -->
@@ -9998,16 +10153,17 @@
          <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='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:[@key='label']"
+   <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>
+      <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:[@key='usage']"
+   <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="profile/merge/custom//group/param/usage" -->
@@ -10028,16 +10184,17 @@
          <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='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:[@key='usage']"
+   <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>
+      <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:[@key='description']"
+   <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="profile/merge/custom//group/param/constraint/description" -->
@@ -10058,12 +10215,13 @@
          <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='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:[@key='description']"
+   <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>
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -10084,7 +10242,7 @@
          <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:[@key='expression']"
+   <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" -->
@@ -10104,20 +10262,21 @@
          <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='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:[@key='expression']"
+   <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>
+      <value as-type="string" 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='guidelines']/j:map"
-                 priority="12">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/merge/custom//group/param/guideline" -->
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+   <!-- 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="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _key="prose"
              _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
              _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
@@ -10128,21 +10287,16 @@
              key="prose"
              _using-name="prose"
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+             _in-json-name="prose">
+         <value as-type="markup-multiline"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6/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:array[@key='guidelines']/j:map"
-                 mode="get-value-property"
-                 priority="12">
-      <value>
-         <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:map[@key='select']/j:array[@key='choice']/j:"
+   <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" -->
@@ -10157,16 +10311,18 @@
              _in-xml-name="choice"
              _in-json-name="choice"
              gi="choice"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='text']"
+   <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="profile/merge/custom//group/link/text" -->
@@ -10186,16 +10342,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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="profile/merge/custom//group//part/title" -->
@@ -10215,20 +10372,21 @@
          <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='groups']/j:map//j:array[@key='parts']/j:map/j:[@key='title']"
+   <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>
+      <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"
-                 priority="10">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/merge/custom//group//part" -->
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+   <!-- 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="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _key="prose"
              _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
              _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
@@ -10239,21 +10397,16 @@
              key="prose"
              _using-name="prose"
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+             _in-json-name="prose">
+         <value as-type="markup-multiline"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6/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='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map//j:array[@key='parts']/j:map"
-                 mode="get-value-property"
-                 priority="10">
-      <value>
-         <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:array[@key='links']/j:map/j:[@key='text']"
+   <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="profile/merge/custom//group//part/link/text" -->
@@ -10273,12 +10426,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -10289,7 +10443,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/insert-controls/include-controls"
                 _metaschema-json-id="/assembly/oscal-profile/insert-controls/include-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:select-control-by-id"
                 _step="include-controls"
                 _key="include-controls"
@@ -10303,7 +10457,7 @@
          <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:"
+   <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" -->
@@ -10318,12 +10472,14 @@
              _in-xml-name="with-id"
              _in-json-name="with-ids"
              gi="with-id"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -10351,7 +10507,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/insert-controls/exclude-controls"
                 _metaschema-json-id="/assembly/oscal-profile/insert-controls/exclude-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:select-control-by-id"
                 _step="exclude-controls"
                 _key="exclude-controls"
@@ -10365,7 +10521,7 @@
          <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:"
+   <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" -->
@@ -10380,12 +10536,14 @@
              _in-xml-name="with-id"
              _in-json-name="with-ids"
              gi="with-id"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -10413,7 +10571,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/insert-controls/include-controls"
                 _metaschema-json-id="/assembly/oscal-profile/insert-controls/include-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:select-control-by-id"
                 _step="include-controls"
                 _key="include-controls"
@@ -10427,7 +10585,7 @@
          <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:"
+   <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" -->
@@ -10442,12 +10600,14 @@
              _in-xml-name="with-id"
              _in-json-name="with-ids"
              gi="with-id"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -10475,7 +10635,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/insert-controls/exclude-controls"
                 _metaschema-json-id="/assembly/oscal-profile/insert-controls/exclude-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:select-control-by-id"
                 _step="exclude-controls"
                 _key="exclude-controls"
@@ -10489,7 +10649,7 @@
          <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:"
+   <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" -->
@@ -10504,12 +10664,14 @@
              _in-xml-name="with-id"
              _in-json-name="with-ids"
              gi="with-id"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -10556,7 +10718,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -10576,16 +10738,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='set-parameters']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='label']"
+   <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="profile/modify/set-parameter/label" -->
@@ -10605,16 +10768,17 @@
          <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='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:[@key='label']"
+   <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>
+      <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:[@key='usage']"
+   <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="profile/modify/set-parameter/usage" -->
@@ -10635,16 +10799,17 @@
          <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='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:[@key='usage']"
+   <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>
+      <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:[@key='description']"
+   <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="profile/modify/set-parameter/constraint/description" -->
@@ -10665,12 +10830,13 @@
          <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:[@key='description']"
+   <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>
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -10691,7 +10857,7 @@
          <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:[@key='expression']"
+   <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" -->
@@ -10711,20 +10877,21 @@
          <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='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:[@key='expression']"
+   <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>
+      <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='guidelines']/j:map"
-                 priority="8">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/modify/set-parameter/guideline" -->
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+   <!-- 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="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _key="prose"
              _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
              _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
@@ -10735,21 +10902,16 @@
              key="prose"
              _using-name="prose"
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+             _in-json-name="prose">
+         <value as-type="markup-multiline"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6/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='modify']/j:array[@key='set-parameters']/j:map/j:array[@key='guidelines']/j:map"
-                 mode="get-value-property"
-                 priority="8">
-      <value>
-         <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:map[@key='select']/j:array[@key='choice']/j:"
+   <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="profile/modify/set-parameter/select/choice" -->
@@ -10764,16 +10926,18 @@
              _in-xml-name="choice"
              _in-json-name="choice"
              gi="choice"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='title']"
+   <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" -->
@@ -10793,16 +10957,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='text']"
+   <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="profile/modify/alter/add/param/link/text" -->
@@ -10822,16 +10987,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='label']"
+   <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="profile/modify/alter/add/param/label" -->
@@ -10851,16 +11017,17 @@
          <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='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:[@key='label']"
+   <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>
+      <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:[@key='usage']"
+   <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="profile/modify/alter/add/param/usage" -->
@@ -10881,16 +11048,17 @@
          <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='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:[@key='usage']"
+   <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>
+      <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:[@key='description']"
+   <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="profile/modify/alter/add/param/constraint/description" -->
@@ -10911,12 +11079,13 @@
          <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='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:[@key='description']"
+   <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>
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -10937,7 +11106,7 @@
          <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:[@key='expression']"
+   <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" -->
@@ -10957,20 +11126,21 @@
          <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='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:[@key='expression']"
+   <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>
+      <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='guidelines']/j:map"
-                 priority="12">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/modify/alter/add/param/guideline" -->
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+   <!-- 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="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _key="prose"
              _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
              _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
@@ -10981,21 +11151,16 @@
              key="prose"
              _using-name="prose"
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+             _in-json-name="prose">
+         <value as-type="markup-multiline"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6/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='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"
-                 mode="get-value-property"
-                 priority="12">
-      <value>
-         <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:map[@key='select']/j:array[@key='choice']/j:"
+   <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" -->
@@ -11010,16 +11175,18 @@
              _in-xml-name="choice"
              _in-json-name="choice"
              gi="choice"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='text']"
+   <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="profile/modify/alter/add/link/text" -->
@@ -11039,16 +11206,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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="profile/modify/alter/add//part/title" -->
@@ -11068,20 +11236,21 @@
          <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='parts']/j:map/j:[@key='title']"
+   <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>
+      <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"
-                 priority="10">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/modify/alter/add//part" -->
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+   <!-- 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="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _key="prose"
              _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
              _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
@@ -11092,21 +11261,16 @@
              key="prose"
              _using-name="prose"
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+             _in-json-name="prose">
+         <value as-type="markup-multiline"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6/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"
-                 mode="get-value-property"
-                 priority="10">
-      <value>
-         <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:array[@key='links']/j:map/j:[@key='text']"
+   <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="profile/modify/alter/add//part/link/text" -->
@@ -11126,12 +11290,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -11159,7 +11324,7 @@
          <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:[@key='title']"
+   <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="profile/back-matter/resource/title" -->
@@ -11179,16 +11344,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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="profile/back-matter/resource/description" -->
@@ -11209,12 +11375,13 @@
          <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='back-matter']/j:array[@key='resources']/j:map/j:[@key='description']"
+   <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>
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -11227,7 +11394,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -11269,7 +11436,7 @@
          <xsl:apply-templates select="*[@key='links']"/>
       </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:[@key='text']"
+   <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="profile/back-matter/resource/citation/text" -->
@@ -11289,16 +11456,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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="profile/back-matter/resource/citation/link/text" -->
@@ -11318,12 +11486,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -11376,7 +11545,7 @@
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:[@key='title']"
+   <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/metadata/title" -->
@@ -11396,16 +11565,17 @@
          <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:[@key='title']"
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:string[@key='title']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='published']"
+   <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/metadata/published" -->
@@ -11415,7 +11585,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -11428,16 +11598,17 @@
          <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='component-definition']/j:map[@key='metadata']/j:[@key='published']"
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:string[@key='published']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='last-modified']"
+   <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/metadata/last-modified" -->
@@ -11447,7 +11618,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -11460,16 +11631,17 @@
          <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='component-definition']/j:map[@key='metadata']/j:[@key='last-modified']"
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:string[@key='last-modified']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='version']"
+   <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/metadata/version" -->
@@ -11479,7 +11651,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -11492,16 +11664,17 @@
          <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:map[@key='metadata']/j:[@key='version']"
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:string[@key='version']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='oscal-version']"
+   <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/metadata/oscal-version" -->
@@ -11511,7 +11684,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -11524,12 +11697,13 @@
          <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='component-definition']/j:map[@key='metadata']/j:[@key='oscal-version']"
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:string[@key='oscal-version']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -11540,7 +11714,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/revisions/revision"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/revisions"
                 name="revision"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:revision"
                 _step="revisions/revision"
                 _key="revisions"
@@ -11568,7 +11742,7 @@
              group-json="ARRAY"
              name="revision"
              key="revisions"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:revision"
              _key-ref="oscal-metadata:revision">
          <xsl:if test="$with-key">
@@ -11577,7 +11751,7 @@
          <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:[@key='title']"
+   <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" -->
@@ -11597,16 +11771,17 @@
          <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='revisions']/j:array[@key='revisions']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='published']"
+   <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/metadata/revisions/revision/published" -->
@@ -11616,7 +11791,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -11629,16 +11804,17 @@
          <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='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='published']"
+   <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>
+      <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:[@key='last-modified']"
+   <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/metadata/revisions/revision/last-modified" -->
@@ -11648,7 +11824,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -11661,16 +11837,17 @@
          <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='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='last-modified']"
+   <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>
+      <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:[@key='version']"
+   <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/metadata/revisions/revision/version" -->
@@ -11680,7 +11857,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -11693,16 +11870,17 @@
          <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:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='version']"
+   <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>
+      <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:[@key='oscal-version']"
+   <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/metadata/revisions/revision/oscal-version" -->
@@ -11712,7 +11890,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -11725,16 +11903,17 @@
          <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='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='oscal-version']"
+   <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>
+      <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:[@key='text']"
+   <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/metadata/revisions/revision/link/text" -->
@@ -11754,12 +11933,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -11772,7 +11952,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -11792,7 +11972,7 @@
          <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:[@key='text']"
+   <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/metadata/link/text" -->
@@ -11812,16 +11992,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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/metadata/role/title" -->
@@ -11841,16 +12022,17 @@
          <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='roles']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='short-name']"
+   <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/metadata/role/short-name" -->
@@ -11870,16 +12052,17 @@
          <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='component-definition']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:[@key='short-name']"
+   <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>
+      <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:[@key='description']"
+   <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/metadata/role/description" -->
@@ -11900,16 +12083,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -11929,16 +12113,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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/metadata/location/title" -->
@@ -11958,12 +12143,13 @@
          <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:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -11975,7 +12161,7 @@
                 _metaschema-json-id="/assembly/oscal-metadata/location/address"
                 name="address"
                 key="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="address"
@@ -11995,7 +12181,7 @@
          <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:"
+   <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" -->
@@ -12004,7 +12190,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -12013,16 +12199,18 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='city']"
+   <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/metadata/location/address/city" -->
@@ -12042,16 +12230,17 @@
          <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='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:[@key='city']"
+   <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>
+      <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:[@key='state']"
+   <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/metadata/location/address/state" -->
@@ -12071,16 +12260,17 @@
          <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='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:[@key='state']"
+   <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>
+      <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:[@key='postal-code']"
+   <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/metadata/location/address/postal-code" -->
@@ -12100,16 +12290,17 @@
          <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='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:[@key='postal-code']"
+   <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>
+      <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:[@key='country']"
+   <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/metadata/location/address/country" -->
@@ -12129,16 +12320,17 @@
          <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='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:[@key='country']"
+   <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>
+      <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:"
+   <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/metadata/location/email-address" -->
@@ -12147,7 +12339,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -12156,12 +12348,14 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -12174,7 +12368,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -12194,7 +12388,7 @@
          <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:"
+   <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="component-definition/metadata/location/url" -->
@@ -12209,16 +12403,18 @@
              _in-xml-name="url"
              _in-json-name="urls"
              gi="url"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='text']"
+   <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="component-definition/metadata/location/link/text" -->
@@ -12238,16 +12434,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='name']"
+   <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" -->
@@ -12267,16 +12464,17 @@
          <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='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:[@key='name']"
+   <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>
+      <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:[@key='short-name']"
+   <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="component-definition/metadata/party/short-name" -->
@@ -12296,12 +12494,13 @@
          <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='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:[@key='short-name']"
+   <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>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -12331,7 +12530,7 @@
          <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:[@key='text']"
+   <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="component-definition/metadata/party/link/text" -->
@@ -12351,16 +12550,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:"
+   <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="component-definition/metadata/party/email-address" -->
@@ -12369,7 +12569,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -12378,12 +12578,14 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -12396,7 +12598,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -12423,7 +12625,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/party/address"
                 _metaschema-json-id="/assembly/oscal-metadata/party/addresses"
                 name="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="addresses"
@@ -12440,7 +12642,7 @@
          <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:"
+   <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" -->
@@ -12449,7 +12651,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -12458,16 +12660,18 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='city']"
+   <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="component-definition/metadata/party/address/city" -->
@@ -12487,16 +12691,17 @@
          <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='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:[@key='city']"
+   <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>
+      <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:[@key='state']"
+   <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="component-definition/metadata/party/address/state" -->
@@ -12516,16 +12721,17 @@
          <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='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:[@key='state']"
+   <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>
+      <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:[@key='postal-code']"
+   <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="component-definition/metadata/party/address/postal-code" -->
@@ -12545,16 +12751,17 @@
          <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='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:[@key='postal-code']"
+   <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>
+      <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:[@key='country']"
+   <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="component-definition/metadata/party/address/country" -->
@@ -12574,16 +12781,17 @@
          <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='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:[@key='country']"
+   <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>
+      <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:"
+   <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="component-definition/metadata/party/member-of-organization" -->
@@ -12598,16 +12806,18 @@
              _in-xml-name="member-of-organization"
              _in-json-name="member-of-organizations"
              gi="member-of-organization"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='text']"
+   <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="component-definition/metadata/responsible-party/link/text" -->
@@ -12627,16 +12837,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-parties']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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="component-definition/component/title" -->
@@ -12656,16 +12867,17 @@
          <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='components']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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="component-definition/component/description" -->
@@ -12686,16 +12898,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='purpose']"
+   <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="component-definition/component/purpose" -->
@@ -12715,16 +12928,17 @@
          <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='component-definition']/j:array[@key='components']/j:map/j:[@key='purpose']"
+   <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>
+      <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:[@key='text']"
+   <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="component-definition/component/link/text" -->
@@ -12744,16 +12958,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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="component-definition/component/responsible-role/link/text" -->
@@ -12773,16 +12988,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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="component-definition/component/protocol/title" -->
@@ -12802,12 +13018,13 @@
          <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='components']/j:map/j:array[@key='protocols']/j:map/j:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -12818,7 +13035,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/defined-component/control-implementation"
                 _metaschema-json-id="/assembly/oscal-component-definition/defined-component/control-implementations"
                 name="control-implementation"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:control-implementation"
                 _step="control-implementation"
                 _key="control-implementations"
@@ -12836,7 +13053,7 @@
          <xsl:apply-templates select="*[@key='implemented-requirements']"/>
       </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:[@key='description']"
+   <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="component-definition/component/control-implementation/description" -->
@@ -12857,16 +13074,17 @@
          <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:array[@key='control-implementations']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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="component-definition/component/control-implementation/link/text" -->
@@ -12886,16 +13104,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <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:"
+   <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="component-definition/component/control-implementation/set-parameter/value" -->
@@ -12910,12 +13129,14 @@
              _in-xml-name="value"
              _in-json-name="values"
              gi="value"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -12926,7 +13147,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/control-implementation/implemented-requirement"
                 _metaschema-json-id="/assembly/oscal-component-definition/control-implementation/implemented-requirements"
                 name="implemented-requirement"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:implemented-requirement"
                 _step="implemented-requirement"
                 _key="implemented-requirements"
@@ -12946,7 +13167,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -12967,16 +13188,17 @@
          <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:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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="component-definition/component/control-implementation/implemented-requirement/link/text" -->
@@ -12996,16 +13218,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:"
+   <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="component-definition/component/control-implementation/implemented-requirement/set-parameter/value" -->
@@ -13020,16 +13243,18 @@
              _in-xml-name="value"
              _in-json-name="values"
              gi="value"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='text']"
+   <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="component-definition/component/control-implementation/implemented-requirement/responsible-role/link/text" -->
@@ -13049,12 +13274,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -13065,7 +13291,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/implemented-requirement/statement"
                 _metaschema-json-id="/assembly/oscal-component-definition/implemented-requirement/statements"
                 name="statement"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:statement"
                 _step="statement"
                 _key="statements"
@@ -13083,7 +13309,7 @@
          <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:[@key='description']"
+   <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="component-definition/component/control-implementation/implemented-requirement/statement/description" -->
@@ -13104,16 +13330,17 @@
          <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:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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="component-definition/component/control-implementation/implemented-requirement/statement/link/text" -->
@@ -13133,16 +13360,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='statements']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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="component-definition/component/control-implementation/implemented-requirement/statement/responsible-role/link/text" -->
@@ -13162,16 +13390,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='statements']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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="component-definition/capability/description" -->
@@ -13192,16 +13421,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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="component-definition/capability/link/text" -->
@@ -13221,16 +13451,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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="component-definition/capability/incorporates-component/description" -->
@@ -13251,12 +13482,13 @@
          <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='incorporates-components']/j:map/j:[@key='description']"
+   <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>
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -13267,7 +13499,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/capability/control-implementation"
                 _metaschema-json-id="/assembly/oscal-component-definition/capability/control-implementations"
                 name="control-implementation"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:control-implementation"
                 _step="control-implementation"
                 _key="control-implementations"
@@ -13285,7 +13517,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -13306,16 +13538,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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="component-definition/capability/control-implementation/link/text" -->
@@ -13335,16 +13568,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <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:"
+   <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="component-definition/capability/control-implementation/set-parameter/value" -->
@@ -13359,12 +13593,14 @@
              _in-xml-name="value"
              _in-json-name="values"
              gi="value"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -13375,7 +13611,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/control-implementation/implemented-requirement"
                 _metaschema-json-id="/assembly/oscal-component-definition/control-implementation/implemented-requirements"
                 name="implemented-requirement"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:implemented-requirement"
                 _step="implemented-requirement"
                 _key="implemented-requirements"
@@ -13395,7 +13631,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -13416,16 +13652,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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="component-definition/capability/control-implementation/implemented-requirement/link/text" -->
@@ -13445,16 +13682,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:"
+   <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="component-definition/capability/control-implementation/implemented-requirement/set-parameter/value" -->
@@ -13469,16 +13707,18 @@
              _in-xml-name="value"
              _in-json-name="values"
              gi="value"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='text']"
+   <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="component-definition/capability/control-implementation/implemented-requirement/responsible-role/link/text" -->
@@ -13498,12 +13738,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -13514,7 +13755,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/implemented-requirement/statement"
                 _metaschema-json-id="/assembly/oscal-component-definition/implemented-requirement/statements"
                 name="statement"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:statement"
                 _step="statement"
                 _key="statements"
@@ -13532,7 +13773,7 @@
          <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:[@key='description']"
+   <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="component-definition/capability/control-implementation/implemented-requirement/statement/description" -->
@@ -13553,16 +13794,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -13582,16 +13824,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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="component-definition/capability/control-implementation/implemented-requirement/statement/responsible-role/link/text" -->
@@ -13611,12 +13854,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -13644,7 +13888,7 @@
          <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:[@key='title']"
+   <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="component-definition/back-matter/resource/title" -->
@@ -13664,16 +13908,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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="component-definition/back-matter/resource/description" -->
@@ -13694,12 +13939,13 @@
          <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='back-matter']/j:array[@key='resources']/j:map/j:[@key='description']"
+   <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>
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -13712,7 +13958,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -13754,7 +14000,7 @@
          <xsl:apply-templates select="*[@key='links']"/>
       </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:[@key='text']"
+   <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="component-definition/back-matter/resource/citation/text" -->
@@ -13774,16 +14020,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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="component-definition/back-matter/resource/citation/link/text" -->
@@ -13803,12 +14050,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -13861,7 +14109,7 @@
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:[@key='title']"
+   <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/metadata/title" -->
@@ -13881,16 +14129,17 @@
          <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:[@key='title']"
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:string[@key='title']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='published']"
+   <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/metadata/published" -->
@@ -13900,7 +14149,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -13913,16 +14162,17 @@
          <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='system-security-plan']/j:map[@key='metadata']/j:[@key='published']"
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:string[@key='published']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='last-modified']"
+   <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/metadata/last-modified" -->
@@ -13932,7 +14182,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -13945,16 +14195,17 @@
          <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='system-security-plan']/j:map[@key='metadata']/j:[@key='last-modified']"
+   <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>
+      <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:[@key='version']"
+   <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/metadata/version" -->
@@ -13964,7 +14215,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -13977,16 +14228,17 @@
          <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='system-security-plan']/j:map[@key='metadata']/j:[@key='version']"
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:string[@key='version']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='oscal-version']"
+   <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/metadata/oscal-version" -->
@@ -13996,7 +14248,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -14009,12 +14261,13 @@
          <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='system-security-plan']/j:map[@key='metadata']/j:[@key='oscal-version']"
+   <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>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -14025,7 +14278,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/revisions/revision"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/revisions"
                 name="revision"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:revision"
                 _step="revisions/revision"
                 _key="revisions"
@@ -14053,7 +14306,7 @@
              group-json="ARRAY"
              name="revision"
              key="revisions"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:revision"
              _key-ref="oscal-metadata:revision">
          <xsl:if test="$with-key">
@@ -14062,7 +14315,7 @@
          <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:[@key='title']"
+   <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" -->
@@ -14082,16 +14335,17 @@
          <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='revisions']/j:array[@key='revisions']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='published']"
+   <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/metadata/revisions/revision/published" -->
@@ -14101,7 +14355,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -14114,16 +14368,17 @@
          <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='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='published']"
+   <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>
+      <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:[@key='last-modified']"
+   <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/metadata/revisions/revision/last-modified" -->
@@ -14133,7 +14388,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -14146,16 +14401,17 @@
          <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='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='last-modified']"
+   <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>
+      <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:[@key='version']"
+   <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/metadata/revisions/revision/version" -->
@@ -14165,7 +14421,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -14178,16 +14434,17 @@
          <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='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='version']"
+   <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>
+      <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:[@key='oscal-version']"
+   <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/metadata/revisions/revision/oscal-version" -->
@@ -14197,7 +14454,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -14210,16 +14467,17 @@
          <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='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='oscal-version']"
+   <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>
+      <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:[@key='text']"
+   <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/metadata/revisions/revision/link/text" -->
@@ -14239,12 +14497,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -14257,7 +14516,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -14277,7 +14536,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -14297,16 +14556,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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/metadata/role/title" -->
@@ -14326,16 +14586,17 @@
          <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='roles']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='short-name']"
+   <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/metadata/role/short-name" -->
@@ -14355,16 +14616,17 @@
          <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='system-security-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:[@key='short-name']"
+   <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>
+      <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:[@key='description']"
+   <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/metadata/role/description" -->
@@ -14385,16 +14647,17 @@
          <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='roles']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/metadata/role/link/text" -->
@@ -14414,16 +14677,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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" -->
@@ -14443,12 +14707,13 @@
          <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:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -14460,7 +14725,7 @@
                 _metaschema-json-id="/assembly/oscal-metadata/location/address"
                 name="address"
                 key="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="address"
@@ -14480,7 +14745,7 @@
          <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:"
+   <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" -->
@@ -14489,7 +14754,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -14498,16 +14763,18 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='city']"
+   <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/metadata/location/address/city" -->
@@ -14527,16 +14794,17 @@
          <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='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:[@key='city']"
+   <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>
+      <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:[@key='state']"
+   <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/metadata/location/address/state" -->
@@ -14556,16 +14824,17 @@
          <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='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:[@key='state']"
+   <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>
+      <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:[@key='postal-code']"
+   <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/metadata/location/address/postal-code" -->
@@ -14585,16 +14854,17 @@
          <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='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:[@key='postal-code']"
+   <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>
+      <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:[@key='country']"
+   <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/metadata/location/address/country" -->
@@ -14614,16 +14884,17 @@
          <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='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:[@key='country']"
+   <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>
+      <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:"
+   <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" -->
@@ -14632,7 +14903,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -14641,12 +14912,14 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -14659,7 +14932,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -14679,7 +14952,7 @@
          <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:"
+   <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/metadata/location/url" -->
@@ -14694,16 +14967,18 @@
              _in-xml-name="url"
              _in-json-name="urls"
              gi="url"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='text']"
+   <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/metadata/location/link/text" -->
@@ -14723,16 +14998,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='name']"
+   <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" -->
@@ -14752,16 +15028,17 @@
          <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='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:[@key='name']"
+   <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>
+      <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:[@key='short-name']"
+   <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/metadata/party/short-name" -->
@@ -14781,12 +15058,13 @@
          <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='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:[@key='short-name']"
+   <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>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -14816,7 +15094,7 @@
          <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:[@key='text']"
+   <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/metadata/party/link/text" -->
@@ -14836,16 +15114,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:"
+   <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/metadata/party/email-address" -->
@@ -14854,7 +15133,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -14863,12 +15142,14 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -14881,7 +15162,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -14908,7 +15189,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/party/address"
                 _metaschema-json-id="/assembly/oscal-metadata/party/addresses"
                 name="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="addresses"
@@ -14925,7 +15206,7 @@
          <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='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:"
+   <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/metadata/party/address/addr-line" -->
@@ -14934,7 +15215,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -14943,16 +15224,18 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='city']"
+   <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/metadata/party/address/city" -->
@@ -14972,16 +15255,17 @@
          <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='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:[@key='city']"
+   <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>
+      <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:[@key='state']"
+   <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/metadata/party/address/state" -->
@@ -15001,16 +15285,17 @@
          <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='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:[@key='state']"
+   <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>
+      <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:[@key='postal-code']"
+   <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/metadata/party/address/postal-code" -->
@@ -15030,16 +15315,17 @@
          <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='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:[@key='postal-code']"
+   <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>
+      <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:[@key='country']"
+   <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/metadata/party/address/country" -->
@@ -15059,16 +15345,17 @@
          <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='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:[@key='country']"
+   <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>
+      <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:"
+   <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/metadata/party/member-of-organization" -->
@@ -15083,16 +15370,18 @@
              _in-xml-name="member-of-organization"
              _in-json-name="member-of-organizations"
              gi="member-of-organization"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='text']"
+   <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/metadata/responsible-party/link/text" -->
@@ -15112,16 +15401,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-parties']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='system-name']"
+   <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-characteristics/system-name" -->
@@ -15141,16 +15431,17 @@
          <xsl:if test="$with-key">
             <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-characteristics']/j:[@key='system-name']"
+   <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>
+      <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:[@key='system-name-short']"
+   <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-characteristics/system-name-short" -->
@@ -15170,16 +15461,17 @@
          <xsl:if test="$with-key">
             <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-characteristics']/j:[@key='system-name-short']"
+   <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>
+      <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:[@key='description']"
+   <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-characteristics/description" -->
@@ -15200,16 +15492,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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-characteristics/link/text" -->
@@ -15229,16 +15522,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='date-authorized']"
+   <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" -->
@@ -15248,7 +15542,7 @@
              as-type="date"
              name="date-authorized"
              key="date-authorized"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:date-authorized"
              _step="date-authorized"
              _key="date-authorized"
@@ -15261,16 +15555,17 @@
          <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:[@key='date-authorized']"
+   <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>
+      <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:[@key='security-sensitivity-level']"
+   <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-characteristics/security-sensitivity-level" -->
@@ -15290,16 +15585,17 @@
          <xsl:if test="$with-key">
             <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-characteristics']/j:[@key='security-sensitivity-level']"
+   <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>
+      <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:[@key='text']"
+   <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-characteristics/system-information/link/text" -->
@@ -15319,12 +15615,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -15352,7 +15649,7 @@
          <xsl:apply-templates select="*[@key='availability-impact']"/>
       </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:[@key='title']"
+   <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/system-characteristics/system-information/information-type/title" -->
@@ -15372,16 +15669,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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/system-characteristics/system-information/information-type/description" -->
@@ -15402,12 +15700,13 @@
          <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='system-information']/j:array[@key='information-types']/j:map/j:[@key='description']"
+   <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>
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -15428,7 +15727,7 @@
          <xsl:apply-templates select="*[@key='information-type-ids']"/>
       </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:"
+   <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/system-characteristics/system-information/information-type/categorization/information-type-id" -->
@@ -15443,16 +15742,18 @@
              _in-xml-name="information-type-id"
              _in-json-name="information-type-ids"
              gi="information-type-id"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='text']"
+   <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/system-characteristics/system-information/information-type/link/text" -->
@@ -15472,12 +15773,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -15505,7 +15807,7 @@
          <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:[@key='text']"
+   <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/system-characteristics/system-information/information-type/confidentiality-impact/link/text" -->
@@ -15525,16 +15827,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='base']"
+   <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/system-characteristics/system-information/information-type/confidentiality-impact/base" -->
@@ -15544,7 +15847,7 @@
              as-type="string"
              name="base"
              key="base"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:base"
              _step="base"
              _key="base"
@@ -15557,16 +15860,17 @@
          <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='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='confidentiality-impact']/j:[@key='base']"
+   <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>
+      <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:[@key='selected']"
+   <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/system-characteristics/system-information/information-type/confidentiality-impact/selected" -->
@@ -15576,7 +15880,7 @@
              as-type="string"
              name="selected"
              key="selected"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:selected"
              _step="selected"
              _key="selected"
@@ -15589,16 +15893,17 @@
          <xsl:if test="$with-key">
             <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='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='confidentiality-impact']/j:[@key='selected']"
+   <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>
+      <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:[@key='adjustment-justification']"
+   <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/system-characteristics/system-information/information-type/confidentiality-impact/adjustment-justification" -->
@@ -15609,7 +15914,7 @@
              as-type="markup-multiline"
              name="adjustment-justification"
              key="adjustment-justification"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:adjustment-justification"
              _step="adjustment-justification"
              _key="adjustment-justification"
@@ -15622,12 +15927,13 @@
          <xsl:if test="$with-key">
             <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='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='confidentiality-impact']/j:[@key='adjustment-justification']"
+   <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>
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -15655,7 +15961,7 @@
          <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:[@key='text']"
+   <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/system-characteristics/system-information/information-type/integrity-impact/link/text" -->
@@ -15675,16 +15981,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='integrity-impact']/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='base']"
+   <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/system-characteristics/system-information/information-type/integrity-impact/base" -->
@@ -15694,7 +16001,7 @@
              as-type="string"
              name="base"
              key="base"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:base"
              _step="base"
              _key="base"
@@ -15707,16 +16014,17 @@
          <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='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='integrity-impact']/j:[@key='base']"
+   <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>
+      <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:[@key='selected']"
+   <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/system-characteristics/system-information/information-type/integrity-impact/selected" -->
@@ -15726,7 +16034,7 @@
              as-type="string"
              name="selected"
              key="selected"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:selected"
              _step="selected"
              _key="selected"
@@ -15739,16 +16047,17 @@
          <xsl:if test="$with-key">
             <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='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='integrity-impact']/j:[@key='selected']"
+   <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>
+      <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:[@key='adjustment-justification']"
+   <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/system-characteristics/system-information/information-type/integrity-impact/adjustment-justification" -->
@@ -15759,7 +16068,7 @@
              as-type="markup-multiline"
              name="adjustment-justification"
              key="adjustment-justification"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:adjustment-justification"
              _step="adjustment-justification"
              _key="adjustment-justification"
@@ -15772,12 +16081,13 @@
          <xsl:if test="$with-key">
             <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='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='integrity-impact']/j:[@key='adjustment-justification']"
+   <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>
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -15805,7 +16115,7 @@
          <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:[@key='text']"
+   <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/system-characteristics/system-information/information-type/availability-impact/link/text" -->
@@ -15825,16 +16135,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='availability-impact']/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='base']"
+   <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/system-characteristics/system-information/information-type/availability-impact/base" -->
@@ -15844,7 +16155,7 @@
              as-type="string"
              name="base"
              key="base"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:base"
              _step="base"
              _key="base"
@@ -15857,16 +16168,17 @@
          <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='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='availability-impact']/j:[@key='base']"
+   <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>
+      <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:[@key='selected']"
+   <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/system-characteristics/system-information/information-type/availability-impact/selected" -->
@@ -15876,7 +16188,7 @@
              as-type="string"
              name="selected"
              key="selected"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:selected"
              _step="selected"
              _key="selected"
@@ -15889,16 +16201,17 @@
          <xsl:if test="$with-key">
             <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='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='availability-impact']/j:[@key='selected']"
+   <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>
+      <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:[@key='adjustment-justification']"
+   <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/system-characteristics/system-information/information-type/availability-impact/adjustment-justification" -->
@@ -15909,7 +16222,7 @@
              as-type="markup-multiline"
              name="adjustment-justification"
              key="adjustment-justification"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:adjustment-justification"
              _step="adjustment-justification"
              _key="adjustment-justification"
@@ -15922,16 +16235,17 @@
          <xsl:if test="$with-key">
             <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='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='availability-impact']/j:[@key='adjustment-justification']"
+   <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>
+      <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:[@key='security-objective-confidentiality']"
+   <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/system-characteristics/security-impact-level/security-objective-confidentiality" -->
@@ -15951,16 +16265,17 @@
          <xsl:if test="$with-key">
             <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='system-characteristics']/j:map[@key='security-impact-level']/j:[@key='security-objective-confidentiality']"
+   <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>
+      <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:[@key='security-objective-integrity']"
+   <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/system-characteristics/security-impact-level/security-objective-integrity" -->
@@ -15980,16 +16295,17 @@
          <xsl:if test="$with-key">
             <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='system-characteristics']/j:map[@key='security-impact-level']/j:[@key='security-objective-integrity']"
+   <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>
+      <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:[@key='security-objective-availability']"
+   <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/system-characteristics/security-impact-level/security-objective-availability" -->
@@ -16009,12 +16325,13 @@
          <xsl:if test="$with-key">
             <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='system-characteristics']/j:map[@key='security-impact-level']/j:[@key='security-objective-availability']"
+   <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>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -16026,7 +16343,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/status"
                 name="status"
                 key="status"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:status"
                 _step="status"
                 _key="status"
@@ -16042,7 +16359,7 @@
          <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:[@key='description']"
+   <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/system-characteristics/authorization-boundary/description" -->
@@ -16063,16 +16380,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/system-characteristics/authorization-boundary/link/text" -->
@@ -16092,16 +16410,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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/system-characteristics/authorization-boundary/diagram/description" -->
@@ -16122,16 +16441,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/system-characteristics/authorization-boundary/diagram/link/text" -->
@@ -16151,16 +16471,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='caption']"
+   <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/system-characteristics/authorization-boundary/diagram/caption" -->
@@ -16180,16 +16501,17 @@
          <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='system-characteristics']/j:map[@key='authorization-boundary']/j:array[@key='diagrams']/j:map/j:[@key='caption']"
+   <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>
+      <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:[@key='remarks']"
+   <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='remarks']"
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/authorization-boundary/diagram/remarks" -->
@@ -16210,16 +16532,17 @@
          <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:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='authorization-boundary']/j:array[@key='diagrams']/j:map/j:[@key='remarks']"
+   <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='remarks']"
                  mode="get-value-property"
                  priority="7">
-      <value>
+      <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:[@key='remarks']"
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='authorization-boundary']/j:string[@key='remarks']"
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/authorization-boundary/remarks" -->
@@ -16240,16 +16563,17 @@
          <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:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='authorization-boundary']/j:[@key='remarks']"
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='authorization-boundary']/j:string[@key='remarks']"
                  mode="get-value-property"
                  priority="5">
-      <value>
+      <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:[@key='description']"
+   <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/system-characteristics/network-architecture/description" -->
@@ -16270,16 +16594,17 @@
          <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='network-architecture']/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/system-characteristics/network-architecture/link/text" -->
@@ -16299,16 +16624,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='network-architecture']/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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/system-characteristics/network-architecture/diagram/description" -->
@@ -16329,16 +16655,17 @@
          <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='network-architecture']/j:array[@key='diagrams']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/system-characteristics/network-architecture/diagram/link/text" -->
@@ -16358,16 +16685,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='network-architecture']/j:array[@key='diagrams']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='caption']"
+   <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/system-characteristics/network-architecture/diagram/caption" -->
@@ -16387,16 +16715,17 @@
          <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='system-characteristics']/j:map[@key='network-architecture']/j:array[@key='diagrams']/j:map/j:[@key='caption']"
+   <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>
+      <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:[@key='remarks']"
+   <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='remarks']"
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/network-architecture/diagram/remarks" -->
@@ -16417,16 +16746,17 @@
          <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:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='network-architecture']/j:array[@key='diagrams']/j:map/j:[@key='remarks']"
+   <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='remarks']"
                  mode="get-value-property"
                  priority="7">
-      <value>
+      <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:[@key='description']"
+   <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/system-characteristics/data-flow/description" -->
@@ -16447,16 +16777,17 @@
          <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='data-flow']/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/system-characteristics/data-flow/link/text" -->
@@ -16476,16 +16807,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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" -->
@@ -16506,16 +16838,17 @@
          <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='data-flow']/j:array[@key='diagrams']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/system-characteristics/data-flow/diagram/link/text" -->
@@ -16535,16 +16868,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='caption']"
+   <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/system-characteristics/data-flow/diagram/caption" -->
@@ -16564,16 +16898,17 @@
          <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='system-characteristics']/j:map[@key='data-flow']/j:array[@key='diagrams']/j:map/j:[@key='caption']"
+   <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>
+      <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:[@key='remarks']"
+   <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='remarks']"
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/data-flow/diagram/remarks" -->
@@ -16594,16 +16929,17 @@
          <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:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='data-flow']/j:array[@key='diagrams']/j:map/j:[@key='remarks']"
+   <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='remarks']"
                  mode="get-value-property"
                  priority="7">
-      <value>
+      <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='responsible-parties']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/system-characteristics/responsible-party/link/text" -->
@@ -16623,16 +16959,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-parties']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/system-implementation/link/text" -->
@@ -16652,12 +16989,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -16683,7 +17021,7 @@
          <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:[@key='title']"
+   <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" -->
@@ -16703,16 +17041,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='text']"
+   <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/system-implementation/leveraged-authorization/link/text" -->
@@ -16732,16 +17071,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='party-uuid']"
+   <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/system-implementation/leveraged-authorization/party-uuid" -->
@@ -16761,16 +17101,17 @@
          <xsl:if test="$with-key">
             <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='system-implementation']/j:array[@key='leveraged-authorizations']/j:map/j:[@key='party-uuid']"
+   <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>
+      <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:[@key='date-authorized']"
+   <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/system-implementation/leveraged-authorization/date-authorized" -->
@@ -16780,7 +17121,7 @@
              as-type="date"
              name="date-authorized"
              key="date-authorized"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:date-authorized"
              _step="date-authorized"
              _key="date-authorized"
@@ -16793,16 +17134,17 @@
          <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-implementation']/j:array[@key='leveraged-authorizations']/j:map/j:[@key='date-authorized']"
+   <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>
+      <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:[@key='title']"
+   <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/system-implementation/user/title" -->
@@ -16822,16 +17164,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='short-name']"
+   <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/system-implementation/user/short-name" -->
@@ -16851,16 +17194,17 @@
          <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='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='users']/j:map/j:[@key='short-name']"
+   <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>
+      <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:[@key='description']"
+   <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/system-implementation/user/description" -->
@@ -16881,16 +17225,17 @@
          <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='users']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/system-implementation/user/link/text" -->
@@ -16910,16 +17255,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='users']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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/system-implementation/user/authorized-privilege/title" -->
@@ -16939,16 +17285,17 @@
          <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:array[@key='authorized-privileges']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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/system-implementation/user/authorized-privilege/description" -->
@@ -16969,16 +17316,17 @@
          <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='users']/j:map/j:array[@key='authorized-privileges']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='title']"
+   <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/system-implementation/component/title" -->
@@ -16998,16 +17346,17 @@
          <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='components']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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/system-implementation/component/description" -->
@@ -17028,16 +17377,17 @@
          <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='components']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='purpose']"
+   <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/system-implementation/component/purpose" -->
@@ -17057,16 +17407,17 @@
          <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='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:[@key='purpose']"
+   <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>
+      <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:[@key='text']"
+   <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/system-implementation/component/link/text" -->
@@ -17086,12 +17437,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -17116,7 +17468,7 @@
          <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:[@key='text']"
+   <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/system-implementation/component/responsible-role/link/text" -->
@@ -17136,16 +17488,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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="system-security-plan/system-implementation/component/protocol/title" -->
@@ -17165,16 +17518,17 @@
          <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='components']/j:map/j:array[@key='protocols']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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="system-security-plan/system-implementation/inventory-item/description" -->
@@ -17195,16 +17549,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/system-implementation/inventory-item/link/text" -->
@@ -17224,16 +17579,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/system-implementation/inventory-item/responsible-party/link/text" -->
@@ -17253,12 +17609,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-parties']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -17282,7 +17639,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -17302,16 +17659,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/system-implementation/inventory-item/implemented-component/responsible-party/link/text" -->
@@ -17331,12 +17689,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -17348,7 +17707,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-security-plan/control-implementation"
                 name="control-implementation"
                 key="control-implementation"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:control-implementation"
                 _step="control-implementation"
                 _key="control-implementation"
@@ -17365,7 +17724,7 @@
          <xsl:apply-templates select="*[@key='implemented-requirements']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:[@key='description']"
+   <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="system-security-plan/control-implementation/description" -->
@@ -17386,16 +17745,17 @@
          <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:[@key='description']"
+   <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>
+      <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:"
+   <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="system-security-plan/control-implementation/set-parameter/value" -->
@@ -17410,12 +17770,14 @@
              _in-xml-name="value"
              _in-json-name="values"
              gi="value"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -17426,7 +17788,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ssp/control-implementation/implemented-requirement"
                 _metaschema-json-id="/assembly/oscal-ssp/control-implementation/implemented-requirements"
                 name="implemented-requirement"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:implemented-requirement"
                 _step="implemented-requirement"
                 _key="implemented-requirements"
@@ -17446,7 +17808,7 @@
          <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='links']/j:map/j:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/link/text" -->
@@ -17466,16 +17828,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <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:"
+   <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="system-security-plan/control-implementation/implemented-requirement/set-parameter/value" -->
@@ -17490,16 +17853,18 @@
              _in-xml-name="value"
              _in-json-name="values"
              gi="value"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/responsible-role/link/text" -->
@@ -17519,12 +17884,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -17535,7 +17901,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ssp/implemented-requirement/statement"
                 _metaschema-json-id="/assembly/oscal-ssp/implemented-requirement/statements"
                 name="statement"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:statement"
                 _step="statement"
                 _key="statements"
@@ -17553,7 +17919,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -17573,16 +17939,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/statement/responsible-role/link/text" -->
@@ -17602,16 +17969,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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="system-security-plan/control-implementation/implemented-requirement/statement/by-component/description" -->
@@ -17632,16 +18000,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/statement/by-component/link/text" -->
@@ -17661,16 +18030,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:"
+   <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="system-security-plan/control-implementation/implemented-requirement/statement/by-component/set-parameter/value" -->
@@ -17685,12 +18055,14 @@
              _in-xml-name="value"
              _in-json-name="values"
              gi="value"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -17719,7 +18091,7 @@
          <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:[@key='description']"
+   <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="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/description" -->
@@ -17740,16 +18112,17 @@
          <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:map[@key='export']/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/link/text" -->
@@ -17769,12 +18142,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -17799,7 +18173,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -17820,16 +18194,17 @@
          <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:map[@key='export']/j:array[@key='provided']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided/link/text" -->
@@ -17849,16 +18224,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='provided']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided/responsible-role/link/text" -->
@@ -17878,12 +18254,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='provided']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -17909,7 +18286,7 @@
          <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:[@key='description']"
+   <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="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/description" -->
@@ -17930,16 +18307,17 @@
          <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:map[@key='export']/j:array[@key='responsibilities']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/link/text" -->
@@ -17959,16 +18337,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsibilities']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/responsible-role/link/text" -->
@@ -17988,12 +18367,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsibilities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -18018,7 +18398,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -18039,16 +18419,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/link/text" -->
@@ -18068,16 +18449,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/responsible-role/link/text" -->
@@ -18097,12 +18479,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -18128,7 +18511,7 @@
          <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:[@key='description']"
+   <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="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/description" -->
@@ -18149,16 +18532,17 @@
          <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='satisfied']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/link/text" -->
@@ -18178,16 +18562,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/responsible-role/link/text" -->
@@ -18207,16 +18592,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/statement/by-component/responsible-role/link/text" -->
@@ -18236,16 +18622,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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="system-security-plan/control-implementation/implemented-requirement/by-component/description" -->
@@ -18266,16 +18653,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/by-component/link/text" -->
@@ -18295,16 +18683,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:"
+   <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="system-security-plan/control-implementation/implemented-requirement/by-component/set-parameter/value" -->
@@ -18319,12 +18708,14 @@
              _in-xml-name="value"
              _in-json-name="values"
              gi="value"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -18353,7 +18744,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -18374,16 +18765,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/by-component/export/link/text" -->
@@ -18403,12 +18795,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -18433,7 +18826,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -18454,16 +18847,17 @@
          <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='provided']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/by-component/export/provided/link/text" -->
@@ -18483,16 +18877,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/by-component/export/provided/responsible-role/link/text" -->
@@ -18512,12 +18907,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -18543,7 +18939,7 @@
          <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:[@key='description']"
+   <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="system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/description" -->
@@ -18564,16 +18960,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -18593,16 +18990,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/responsible-role/link/text" -->
@@ -18622,12 +19020,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -18652,7 +19051,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -18673,16 +19072,17 @@
          <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='inherited']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/by-component/inherited/link/text" -->
@@ -18702,16 +19102,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='inherited']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/by-component/inherited/responsible-role/link/text" -->
@@ -18731,12 +19132,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='inherited']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -18762,7 +19164,7 @@
          <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:[@key='description']"
+   <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="system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/description" -->
@@ -18783,16 +19185,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/link/text" -->
@@ -18812,16 +19215,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/responsible-role/link/text" -->
@@ -18841,16 +19245,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/by-component/responsible-role/link/text" -->
@@ -18870,12 +19275,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -18903,7 +19309,7 @@
          <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:[@key='title']"
+   <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" -->
@@ -18923,16 +19329,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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="system-security-plan/back-matter/resource/description" -->
@@ -18953,12 +19360,13 @@
          <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:[@key='description']"
+   <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>
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -18971,7 +19379,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -19013,7 +19421,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -19033,16 +19441,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/back-matter/resource/citation/link/text" -->
@@ -19062,12 +19471,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -19120,7 +19530,7 @@
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:[@key='title']"
+   <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" -->
@@ -19140,16 +19550,17 @@
          <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:[@key='title']"
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:string[@key='title']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='published']"
+   <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/metadata/published" -->
@@ -19159,7 +19570,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -19172,16 +19583,17 @@
          <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-plan']/j:map[@key='metadata']/j:[@key='published']"
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:string[@key='published']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='last-modified']"
+   <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/metadata/last-modified" -->
@@ -19191,7 +19603,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -19204,16 +19616,17 @@
          <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-plan']/j:map[@key='metadata']/j:[@key='last-modified']"
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:string[@key='last-modified']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='version']"
+   <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/metadata/version" -->
@@ -19223,7 +19636,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -19236,16 +19649,17 @@
          <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-plan']/j:map[@key='metadata']/j:[@key='version']"
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:string[@key='version']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='oscal-version']"
+   <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/metadata/oscal-version" -->
@@ -19255,7 +19669,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -19268,12 +19682,13 @@
          <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:[@key='oscal-version']"
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:string[@key='oscal-version']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -19284,7 +19699,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/revisions/revision"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/revisions"
                 name="revision"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:revision"
                 _step="revisions/revision"
                 _key="revisions"
@@ -19312,7 +19727,7 @@
              group-json="ARRAY"
              name="revision"
              key="revisions"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:revision"
              _key-ref="oscal-metadata:revision">
          <xsl:if test="$with-key">
@@ -19321,7 +19736,7 @@
          <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:[@key='title']"
+   <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" -->
@@ -19341,16 +19756,17 @@
          <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:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='published']"
+   <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/metadata/revisions/revision/published" -->
@@ -19360,7 +19776,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -19373,16 +19789,17 @@
          <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-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='published']"
+   <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>
+      <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:[@key='last-modified']"
+   <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/metadata/revisions/revision/last-modified" -->
@@ -19392,7 +19809,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -19405,16 +19822,17 @@
          <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-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='last-modified']"
+   <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>
+      <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:[@key='version']"
+   <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/metadata/revisions/revision/version" -->
@@ -19424,7 +19842,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -19437,16 +19855,17 @@
          <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-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='version']"
+   <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>
+      <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:[@key='oscal-version']"
+   <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/metadata/revisions/revision/oscal-version" -->
@@ -19456,7 +19875,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -19469,16 +19888,17 @@
          <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:[@key='oscal-version']"
+   <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>
+      <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:[@key='text']"
+   <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/metadata/revisions/revision/link/text" -->
@@ -19498,12 +19918,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -19516,7 +19937,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -19536,7 +19957,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -19556,16 +19977,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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" -->
@@ -19585,16 +20007,17 @@
          <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:array[@key='roles']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='short-name']"
+   <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/metadata/role/short-name" -->
@@ -19614,16 +20037,17 @@
          <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='metadata']/j:array[@key='roles']/j:map/j:[@key='short-name']"
+   <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>
+      <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:[@key='description']"
+   <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/metadata/role/description" -->
@@ -19644,16 +20068,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/metadata/role/link/text" -->
@@ -19673,16 +20098,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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" -->
@@ -19702,12 +20128,13 @@
          <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:array[@key='locations']/j:map/j:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -19719,7 +20146,7 @@
                 _metaschema-json-id="/assembly/oscal-metadata/location/address"
                 name="address"
                 key="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="address"
@@ -19739,7 +20166,7 @@
          <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:"
+   <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" -->
@@ -19748,7 +20175,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -19757,16 +20184,18 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='city']"
+   <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/metadata/location/address/city" -->
@@ -19786,16 +20215,17 @@
          <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='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:[@key='city']"
+   <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>
+      <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:[@key='state']"
+   <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/metadata/location/address/state" -->
@@ -19815,16 +20245,17 @@
          <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-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:[@key='state']"
+   <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>
+      <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:[@key='postal-code']"
+   <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/metadata/location/address/postal-code" -->
@@ -19844,16 +20275,17 @@
          <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-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:[@key='postal-code']"
+   <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>
+      <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:[@key='country']"
+   <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/metadata/location/address/country" -->
@@ -19873,16 +20305,17 @@
          <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='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:[@key='country']"
+   <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>
+      <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:"
+   <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" -->
@@ -19891,7 +20324,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -19900,12 +20333,14 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -19918,7 +20353,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -19938,7 +20373,7 @@
          <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:"
+   <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/metadata/location/url" -->
@@ -19953,16 +20388,18 @@
              _in-xml-name="url"
              _in-json-name="urls"
              gi="url"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='text']"
+   <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/metadata/location/link/text" -->
@@ -19982,16 +20419,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='name']"
+   <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" -->
@@ -20011,16 +20449,17 @@
          <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-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:[@key='name']"
+   <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>
+      <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:[@key='short-name']"
+   <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/metadata/party/short-name" -->
@@ -20040,12 +20479,13 @@
          <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='metadata']/j:array[@key='parties']/j:map/j:[@key='short-name']"
+   <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>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -20075,7 +20515,7 @@
          <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:[@key='text']"
+   <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/metadata/party/link/text" -->
@@ -20095,16 +20535,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:"
+   <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/metadata/party/email-address" -->
@@ -20113,7 +20554,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -20122,12 +20563,14 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -20140,7 +20583,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -20167,7 +20610,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/party/address"
                 _metaschema-json-id="/assembly/oscal-metadata/party/addresses"
                 name="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="addresses"
@@ -20184,7 +20627,7 @@
          <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:"
+   <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/metadata/party/address/addr-line" -->
@@ -20193,7 +20636,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -20202,16 +20645,18 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='city']"
+   <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/metadata/party/address/city" -->
@@ -20231,16 +20676,17 @@
          <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='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:[@key='city']"
+   <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>
+      <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:[@key='state']"
+   <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/metadata/party/address/state" -->
@@ -20260,16 +20706,17 @@
          <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-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:[@key='state']"
+   <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>
+      <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:[@key='postal-code']"
+   <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/metadata/party/address/postal-code" -->
@@ -20289,16 +20736,17 @@
          <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-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:[@key='postal-code']"
+   <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>
+      <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:[@key='country']"
+   <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/metadata/party/address/country" -->
@@ -20318,16 +20766,17 @@
          <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='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:[@key='country']"
+   <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>
+      <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:"
+   <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/metadata/party/member-of-organization" -->
@@ -20342,16 +20791,18 @@
              _in-xml-name="member-of-organization"
              _in-json-name="member-of-organizations"
              gi="member-of-organization"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -20371,12 +20822,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-parties']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -20405,7 +20857,7 @@
          <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:[@key='title']"
+   <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" -->
@@ -20425,16 +20877,17 @@
          <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='components']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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/local-definitions/component/description" -->
@@ -20455,16 +20908,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='purpose']"
+   <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/local-definitions/component/purpose" -->
@@ -20484,16 +20938,17 @@
          <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='local-definitions']/j:array[@key='components']/j:map/j:[@key='purpose']"
+   <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>
+      <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:[@key='text']"
+   <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/local-definitions/component/link/text" -->
@@ -20513,12 +20968,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -20543,7 +20999,7 @@
          <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:[@key='text']"
+   <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/local-definitions/component/responsible-role/link/text" -->
@@ -20563,16 +21019,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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/local-definitions/component/protocol/title" -->
@@ -20592,16 +21049,17 @@
          <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='components']/j:map/j:array[@key='protocols']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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/local-definitions/inventory-item/description" -->
@@ -20622,16 +21080,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/local-definitions/inventory-item/link/text" -->
@@ -20651,16 +21110,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/local-definitions/inventory-item/responsible-party/link/text" -->
@@ -20680,12 +21140,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -20709,7 +21170,7 @@
          <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:[@key='text']"
+   <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/local-definitions/inventory-item/implemented-component/link/text" -->
@@ -20729,16 +21190,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/local-definitions/inventory-item/implemented-component/responsible-party/link/text" -->
@@ -20758,16 +21220,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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/local-definitions/user/title" -->
@@ -20787,16 +21250,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='short-name']"
+   <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" -->
@@ -20816,16 +21280,17 @@
          <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:[@key='short-name']"
+   <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>
+      <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:[@key='description']"
+   <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" -->
@@ -20846,16 +21311,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/local-definitions/user/link/text" -->
@@ -20875,16 +21341,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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/local-definitions/user/authorized-privilege/title" -->
@@ -20904,16 +21371,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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/local-definitions/user/authorized-privilege/description" -->
@@ -20934,16 +21402,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='description']"
+   <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/local-definitions/objectives-and-methods/description" -->
@@ -20964,16 +21433,17 @@
          <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='objectives-and-methods']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/local-definitions/objectives-and-methods/link/text" -->
@@ -20993,16 +21463,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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/local-definitions/objectives-and-methods//part/title" -->
@@ -21022,20 +21493,21 @@
          <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:[@key='title']"
+   <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>
+      <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"
-                 priority="8">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/objectives-and-methods//part" -->
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+   <!-- 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="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _key="prose"
              _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
              _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
@@ -21046,21 +21518,16 @@
              key="prose"
              _using-name="prose"
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+             _in-json-name="prose">
+         <value as-type="markup-multiline"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6/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"
-                 mode="get-value-property"
-                 priority="8">
-      <value>
-         <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:array[@key='links']/j:map/j:[@key='text']"
+   <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/local-definitions/objectives-and-methods//part/link/text" -->
@@ -21080,16 +21547,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='parts']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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/local-definitions/activity/title" -->
@@ -21109,16 +21577,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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/local-definitions/activity/description" -->
@@ -21139,16 +21608,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/local-definitions/activity/link/text" -->
@@ -21168,12 +21638,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -21200,7 +21671,7 @@
          <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:[@key='title']"
+   <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" -->
@@ -21220,16 +21691,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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/local-definitions/activity/step/description" -->
@@ -21250,16 +21722,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/local-definitions/activity/step/link/text" -->
@@ -21279,16 +21752,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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/local-definitions/activity/step/reviewed-controls/description" -->
@@ -21309,16 +21783,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/local-definitions/activity/step/reviewed-controls/link/text" -->
@@ -21338,12 +21813,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -21369,7 +21845,7 @@
          <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:[@key='description']"
+   <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/local-definitions/activity/step/reviewed-controls/control-selection/description" -->
@@ -21390,16 +21866,17 @@
          <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-selections']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/local-definitions/activity/step/reviewed-controls/control-selection/link/text" -->
@@ -21419,12 +21896,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -21455,7 +21933,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="include-control"
                 _key="include-controls"
@@ -21468,7 +21946,7 @@
          <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:"
+   <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/local-definitions/activity/step/reviewed-controls/control-selection/include-control/statement-id" -->
@@ -21483,12 +21961,14 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -21499,7 +21979,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/exclude-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/exclude-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="exclude-control"
                 _key="exclude-controls"
@@ -21512,7 +21992,7 @@
          <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:"
+   <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" -->
@@ -21527,12 +22007,14 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -21558,7 +22040,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -21579,16 +22061,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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-plan/local-definitions/activity/step/reviewed-controls/control-objective-selection/link/text" -->
@@ -21608,12 +22091,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -21637,7 +22121,7 @@
          </xsl:if>
       </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:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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-plan/local-definitions/activity/step/responsible-role/link/text" -->
@@ -21657,16 +22141,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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-plan/local-definitions/activity/related-controls/description" -->
@@ -21687,16 +22172,17 @@
          <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:map[@key='related-controls']/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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-plan/local-definitions/activity/related-controls/link/text" -->
@@ -21716,12 +22202,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:map[@key='related-controls']/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -21747,7 +22234,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -21768,16 +22255,17 @@
          <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:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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-plan/local-definitions/activity/related-controls/control-selection/link/text" -->
@@ -21797,12 +22285,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -21833,7 +22322,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="include-control"
                 _key="include-controls"
@@ -21846,7 +22335,7 @@
          <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:"
+   <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" -->
@@ -21861,12 +22350,14 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -21877,7 +22368,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/exclude-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/exclude-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="exclude-control"
                 _key="exclude-controls"
@@ -21890,7 +22381,7 @@
          <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:"
+   <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" -->
@@ -21905,12 +22396,14 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -21936,7 +22429,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -21957,16 +22450,17 @@
          <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:map[@key='related-controls']/j:array[@key='control-objective-selections']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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-plan/local-definitions/activity/related-controls/control-objective-selection/link/text" -->
@@ -21986,12 +22480,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:map[@key='related-controls']/j:array[@key='control-objective-selections']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -22015,7 +22510,7 @@
          </xsl:if>
       </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='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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-plan/local-definitions/activity/responsible-role/link/text" -->
@@ -22035,12 +22530,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -22064,7 +22560,7 @@
          <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:[@key='title']"
+   <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" -->
@@ -22084,20 +22580,21 @@
          <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='terms-and-conditions']//j:array[@key='parts']/j:map/j:[@key='title']"
+   <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>
+      <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']//j:array[@key='parts']/j:map"
-                 priority="6">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/terms-and-conditions//part" -->
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+   <!-- 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="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _key="prose"
              _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/p ul ol pre table h1 h2 h3 h4 h5 h6"
              _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/prose"
@@ -22108,21 +22605,16 @@
              key="prose"
              _using-name="prose"
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+             _in-json-name="prose">
+         <value as-type="markup-multiline"
+                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/p ul ol pre table h1 h2 h3 h4 h5 h6/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"
-                 mode="get-value-property"
-                 priority="6">
-      <value>
-         <xsl:value-of select="."/>
-      </value>
-   </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:[@key='text']"
+   <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-plan/terms-and-conditions//part/link/text" -->
@@ -22142,16 +22634,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='terms-and-conditions']//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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-plan/reviewed-controls/description" -->
@@ -22172,16 +22665,17 @@
          <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='reviewed-controls']/j:[@key='description']"
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:string[@key='description']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='text']"
+   <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-plan/reviewed-controls/link/text" -->
@@ -22201,12 +22695,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -22232,7 +22727,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -22253,16 +22748,17 @@
          <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='reviewed-controls']/j:array[@key='control-selections']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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-plan/reviewed-controls/control-selection/link/text" -->
@@ -22282,12 +22778,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='control-selections']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -22318,7 +22815,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="include-control"
                 _key="include-controls"
@@ -22331,7 +22828,7 @@
          <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:"
+   <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" -->
@@ -22346,12 +22843,14 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -22362,7 +22861,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/exclude-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/exclude-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="exclude-control"
                 _key="exclude-controls"
@@ -22375,7 +22874,7 @@
          <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:"
+   <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" -->
@@ -22390,12 +22889,14 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -22421,7 +22922,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -22442,16 +22943,17 @@
          <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='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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-plan/reviewed-controls/control-objective-selection/link/text" -->
@@ -22471,12 +22973,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='control-objective-selections']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -22500,7 +23003,7 @@
          </xsl:if>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:array[@key='assessment-subjects']/j:map/j:[@key='description']"
+   <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-plan/assessment-subject/description" -->
@@ -22521,16 +23024,17 @@
          <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='assessment-subjects']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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-plan/assessment-subject/link/text" -->
@@ -22550,12 +23054,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -22579,7 +23084,7 @@
          </xsl:if>
       </assembly>
    </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:[@key='text']"
+   <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-plan/assessment-subject/include-subject/link/text" -->
@@ -22599,16 +23104,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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-plan/assessment-subject/exclude-subject/link/text" -->
@@ -22628,16 +23134,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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-plan/assessment-assets/component/title" -->
@@ -22657,16 +23164,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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-plan/assessment-assets/component/description" -->
@@ -22687,16 +23195,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='purpose']"
+   <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-plan/assessment-assets/component/purpose" -->
@@ -22716,16 +23225,17 @@
          <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:[@key='purpose']"
+   <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>
+      <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:[@key='text']"
+   <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-plan/assessment-assets/component/link/text" -->
@@ -22745,12 +23255,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -22775,7 +23286,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -22795,16 +23306,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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-plan/assessment-assets/component/protocol/title" -->
@@ -22824,12 +23336,13 @@
          <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:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -22854,7 +23367,7 @@
          <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:[@key='title']"
+   <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-plan/assessment-assets/assessment-platform/title" -->
@@ -22874,16 +23387,17 @@
          <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='assessment-platforms']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='text']"
+   <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-plan/assessment-assets/assessment-platform/link/text" -->
@@ -22903,12 +23417,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -22932,7 +23447,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -22952,16 +23467,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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-plan/assessment-assets/assessment-platform/uses-component/responsible-party/link/text" -->
@@ -22981,16 +23497,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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-plan//task/title" -->
@@ -23010,16 +23527,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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" -->
@@ -23040,16 +23558,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -23069,12 +23588,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -23203,7 +23723,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -23223,16 +23743,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -23252,16 +23773,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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" -->
@@ -23282,16 +23804,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -23311,12 +23834,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -23340,7 +23864,7 @@
          </xsl:if>
       </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='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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" -->
@@ -23360,16 +23884,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -23389,16 +23914,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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" -->
@@ -23419,16 +23945,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -23448,12 +23975,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -23477,7 +24005,7 @@
          </xsl:if>
       </assembly>
    </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:[@key='text']"
+   <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" -->
@@ -23497,16 +24025,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -23526,16 +24055,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -23555,12 +24085,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -23588,7 +24119,7 @@
          <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:[@key='title']"
+   <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" -->
@@ -23608,16 +24139,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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" -->
@@ -23638,12 +24170,13 @@
          <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:[@key='description']"
+   <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>
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -23656,7 +24189,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -23698,7 +24231,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -23718,16 +24251,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -23747,12 +24281,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -23805,7 +24340,7 @@
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:[@key='title']"
+   <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" -->
@@ -23825,16 +24360,17 @@
          <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:[@key='title']"
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:string[@key='title']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='published']"
+   <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" -->
@@ -23844,7 +24380,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -23857,16 +24393,17 @@
          <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:[@key='published']"
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:string[@key='published']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='last-modified']"
+   <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" -->
@@ -23876,7 +24413,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -23889,16 +24426,17 @@
          <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:[@key='last-modified']"
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:string[@key='last-modified']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='version']"
+   <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" -->
@@ -23908,7 +24446,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -23921,16 +24459,17 @@
          <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:[@key='version']"
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:string[@key='version']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='oscal-version']"
+   <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" -->
@@ -23940,7 +24479,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -23953,12 +24492,13 @@
          <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:[@key='oscal-version']"
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:string[@key='oscal-version']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -23969,7 +24509,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/revisions/revision"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/revisions"
                 name="revision"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:revision"
                 _step="revisions/revision"
                 _key="revisions"
@@ -23997,7 +24537,7 @@
              group-json="ARRAY"
              name="revision"
              key="revisions"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:revision"
              _key-ref="oscal-metadata:revision">
          <xsl:if test="$with-key">
@@ -24006,7 +24546,7 @@
          <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:[@key='title']"
+   <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" -->
@@ -24026,16 +24566,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='published']"
+   <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" -->
@@ -24045,7 +24586,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -24058,16 +24599,17 @@
          <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:[@key='published']"
+   <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>
+      <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:[@key='last-modified']"
+   <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" -->
@@ -24077,7 +24619,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -24090,16 +24632,17 @@
          <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:[@key='last-modified']"
+   <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>
+      <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:[@key='version']"
+   <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" -->
@@ -24109,7 +24652,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -24122,16 +24665,17 @@
          <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:[@key='version']"
+   <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>
+      <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:[@key='oscal-version']"
+   <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" -->
@@ -24141,7 +24685,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -24154,16 +24698,17 @@
          <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:[@key='oscal-version']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -24183,12 +24728,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -24201,7 +24747,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -24221,7 +24767,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -24241,16 +24787,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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" -->
@@ -24270,16 +24817,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='short-name']"
+   <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" -->
@@ -24299,16 +24847,17 @@
          <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:[@key='short-name']"
+   <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>
+      <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:[@key='description']"
+   <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" -->
@@ -24329,16 +24878,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -24358,16 +24908,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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" -->
@@ -24387,12 +24938,13 @@
          <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:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -24404,7 +24956,7 @@
                 _metaschema-json-id="/assembly/oscal-metadata/location/address"
                 name="address"
                 key="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="address"
@@ -24424,7 +24976,7 @@
          <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:"
+   <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" -->
@@ -24433,7 +24985,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -24442,16 +24994,18 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='city']"
+   <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" -->
@@ -24471,16 +25025,17 @@
          <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:[@key='city']"
+   <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>
+      <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:[@key='state']"
+   <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" -->
@@ -24500,16 +25055,17 @@
          <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:[@key='state']"
+   <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>
+      <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:[@key='postal-code']"
+   <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" -->
@@ -24529,16 +25085,17 @@
          <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:[@key='postal-code']"
+   <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>
+      <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:[@key='country']"
+   <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" -->
@@ -24558,16 +25115,17 @@
          <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:[@key='country']"
+   <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>
+      <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:"
+   <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" -->
@@ -24576,7 +25134,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -24585,12 +25143,14 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -24603,7 +25163,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -24623,7 +25183,7 @@
          <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:"
+   <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" -->
@@ -24638,16 +25198,18 @@
              _in-xml-name="url"
              _in-json-name="urls"
              gi="url"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -24667,16 +25229,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='name']"
+   <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" -->
@@ -24696,16 +25259,17 @@
          <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:[@key='name']"
+   <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>
+      <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:[@key='short-name']"
+   <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" -->
@@ -24725,12 +25289,13 @@
          <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:[@key='short-name']"
+   <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>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -24760,7 +25325,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -24780,16 +25345,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:"
+   <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" -->
@@ -24798,7 +25364,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -24807,12 +25373,14 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -24825,7 +25393,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -24852,7 +25420,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/party/address"
                 _metaschema-json-id="/assembly/oscal-metadata/party/addresses"
                 name="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="addresses"
@@ -24869,7 +25437,7 @@
          <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:"
+   <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" -->
@@ -24878,7 +25446,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -24887,16 +25455,18 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='city']"
+   <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" -->
@@ -24916,16 +25486,17 @@
          <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:[@key='city']"
+   <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>
+      <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:[@key='state']"
+   <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" -->
@@ -24945,16 +25516,17 @@
          <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:[@key='state']"
+   <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>
+      <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:[@key='postal-code']"
+   <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" -->
@@ -24974,16 +25546,17 @@
          <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:[@key='postal-code']"
+   <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>
+      <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:[@key='country']"
+   <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" -->
@@ -25003,16 +25576,17 @@
          <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:[@key='country']"
+   <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>
+      <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:"
+   <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" -->
@@ -25027,16 +25601,18 @@
              _in-xml-name="member-of-organization"
              _in-json-name="member-of-organizations"
              gi="member-of-organization"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -25056,12 +25632,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -25087,7 +25664,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -25108,16 +25685,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -25137,16 +25715,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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" -->
@@ -25166,20 +25745,21 @@
          <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:[@key='title']"
+   <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>
+      <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"
-                 priority="8">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/local-definitions/objectives-and-methods//part" -->
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+   <!-- 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="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _key="prose"
              _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
              _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
@@ -25190,21 +25770,16 @@
              key="prose"
              _using-name="prose"
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+             _in-json-name="prose">
+         <value as-type="markup-multiline"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6/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"
-                 mode="get-value-property"
-                 priority="8">
-      <value>
-         <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:array[@key='links']/j:map/j:[@key='text']"
+   <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" -->
@@ -25224,16 +25799,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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" -->
@@ -25253,16 +25829,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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" -->
@@ -25283,16 +25860,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -25312,12 +25890,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -25344,7 +25923,7 @@
          <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:[@key='title']"
+   <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" -->
@@ -25364,16 +25943,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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" -->
@@ -25394,16 +25974,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -25423,16 +26004,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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" -->
@@ -25453,16 +26035,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -25482,12 +26065,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -25513,7 +26097,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -25534,16 +26118,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/local-definitions/activity/step/reviewed-controls/control-selection/link/text" -->
@@ -25563,12 +26148,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -25599,7 +26185,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="include-control"
                 _key="include-controls"
@@ -25612,7 +26198,7 @@
          <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:"
+   <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" -->
@@ -25627,12 +26213,14 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -25643,7 +26231,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/exclude-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/exclude-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="exclude-control"
                 _key="exclude-controls"
@@ -25656,7 +26244,7 @@
          <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:"
+   <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" -->
@@ -25671,12 +26259,14 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -25702,7 +26292,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -25723,16 +26313,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -25752,12 +26343,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -25781,7 +26373,7 @@
          </xsl:if>
       </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:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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" -->
@@ -25801,16 +26393,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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" -->
@@ -25831,16 +26424,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -25860,12 +26454,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -25891,7 +26486,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -25912,16 +26507,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -25941,12 +26537,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -25977,7 +26574,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="include-control"
                 _key="include-controls"
@@ -25990,7 +26587,7 @@
          <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:"
+   <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" -->
@@ -26005,12 +26602,14 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -26021,7 +26620,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/exclude-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/exclude-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="exclude-control"
                 _key="exclude-controls"
@@ -26034,7 +26633,7 @@
          <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:"
+   <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" -->
@@ -26049,12 +26648,14 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -26080,7 +26681,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -26101,16 +26702,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/activity/related-controls/control-objective-selection/link/text" -->
@@ -26130,12 +26732,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -26159,7 +26762,7 @@
          </xsl:if>
       </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='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/activity/responsible-role/link/text" -->
@@ -26179,16 +26782,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:[@key='title']"
+   <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/result/title" -->
@@ -26208,16 +26812,17 @@
          <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:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:[@key='description']"
+   <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/result/description" -->
@@ -26238,16 +26843,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='start']"
+   <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/result/start" -->
@@ -26267,16 +26873,17 @@
          <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:[@key='start']"
+   <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>
+      <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:[@key='end']"
+   <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/result/end" -->
@@ -26296,16 +26903,17 @@
          <xsl:if test="$with-key">
             <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:[@key='end']"
+   <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>
+      <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:[@key='text']"
+   <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/result/link/text" -->
@@ -26325,12 +26933,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -26358,7 +26967,7 @@
          <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:[@key='title']"
+   <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/result/local-definitions/component/title" -->
@@ -26378,16 +26987,17 @@
          <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:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='description']"
+   <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/result/local-definitions/component/description" -->
@@ -26408,16 +27018,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='purpose']"
+   <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/result/local-definitions/component/purpose" -->
@@ -26437,16 +27048,17 @@
          <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:array[@key='components']/j:map/j:[@key='purpose']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='text']"
+   <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/result/local-definitions/component/link/text" -->
@@ -26466,12 +27078,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -26496,7 +27109,7 @@
          <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:[@key='text']"
+   <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/result/local-definitions/component/responsible-role/link/text" -->
@@ -26516,16 +27129,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='title']"
+   <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/result/local-definitions/component/protocol/title" -->
@@ -26545,16 +27159,17 @@
          <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:array[@key='protocols']/j:map/j:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='description']"
+   <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/result/local-definitions/inventory-item/description" -->
@@ -26575,16 +27190,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/result/local-definitions/inventory-item/link/text" -->
@@ -26604,16 +27220,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='text']"
+   <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/result/local-definitions/inventory-item/responsible-party/link/text" -->
@@ -26633,12 +27250,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -26662,7 +27280,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -26682,16 +27300,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='text']"
+   <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/result/local-definitions/inventory-item/implemented-component/responsible-party/link/text" -->
@@ -26711,16 +27330,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-parties']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='title']"
+   <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/result/local-definitions/user/title" -->
@@ -26740,16 +27360,17 @@
          <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='users']/j:map/j:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='short-name']"
+   <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/result/local-definitions/user/short-name" -->
@@ -26769,16 +27390,17 @@
          <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:[@key='short-name']"
+   <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>
+      <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:[@key='description']"
+   <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" -->
@@ -26799,16 +27421,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/result/local-definitions/user/link/text" -->
@@ -26828,16 +27451,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='title']"
+   <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/result/local-definitions/user/authorized-privilege/title" -->
@@ -26857,16 +27481,17 @@
          <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='users']/j:map/j:array[@key='authorized-privileges']/j:map/j:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='description']"
+   <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/result/local-definitions/user/authorized-privilege/description" -->
@@ -26887,16 +27512,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='title']"
+   <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/result/local-definitions/assessment-assets/component/title" -->
@@ -26916,16 +27542,17 @@
          <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:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='description']"
+   <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/result/local-definitions/assessment-assets/component/description" -->
@@ -26946,16 +27573,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='purpose']"
+   <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/result/local-definitions/assessment-assets/component/purpose" -->
@@ -26975,16 +27603,17 @@
          <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:[@key='purpose']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='text']"
+   <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" -->
@@ -27004,12 +27633,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -27034,7 +27664,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -27054,16 +27684,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='title']"
+   <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/local-definitions/assessment-assets/component/protocol/title" -->
@@ -27083,12 +27714,13 @@
          <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:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -27113,7 +27745,7 @@
          <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:[@key='title']"
+   <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" -->
@@ -27133,16 +27765,17 @@
          <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:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='text']"
+   <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/local-definitions/assessment-assets/assessment-platform/link/text" -->
@@ -27162,12 +27795,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -27191,7 +27825,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -27211,16 +27845,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='text']"
+   <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/local-definitions/assessment-assets/assessment-platform/uses-component/responsible-party/link/text" -->
@@ -27240,16 +27875,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='title']"
+   <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//assessment-task/title" -->
@@ -27269,16 +27905,17 @@
          <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:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='description']"
+   <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//assessment-task/description" -->
@@ -27299,16 +27936,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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//assessment-task/link/text" -->
@@ -27328,12 +27966,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -27462,7 +28101,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -27482,16 +28121,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='text']"
+   <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//assessment-task/associated-activity/responsible-role/link/text" -->
@@ -27511,16 +28151,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='description']"
+   <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//assessment-task/associated-activity/subject/description" -->
@@ -27541,16 +28182,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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//assessment-task/associated-activity/subject/link/text" -->
@@ -27570,12 +28212,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -27599,7 +28242,7 @@
          </xsl:if>
       </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='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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//assessment-task/associated-activity/subject/include-subject/link/text" -->
@@ -27619,16 +28262,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='text']"
+   <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//assessment-task/associated-activity/subject/exclude-subject/link/text" -->
@@ -27648,16 +28292,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='description']"
+   <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//assessment-task/subject/description" -->
@@ -27678,16 +28323,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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//assessment-task/subject/link/text" -->
@@ -27707,12 +28353,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -27736,7 +28383,7 @@
          </xsl:if>
       </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='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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//assessment-task/subject/include-subject/link/text" -->
@@ -27756,16 +28403,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='text']"
+   <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//assessment-task/subject/exclude-subject/link/text" -->
@@ -27785,16 +28433,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='text']"
+   <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//assessment-task/responsible-role/link/text" -->
@@ -27814,16 +28463,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='description']"
+   <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/reviewed-controls/description" -->
@@ -27844,16 +28494,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/reviewed-controls/link/text" -->
@@ -27873,12 +28524,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -27904,7 +28556,7 @@
          <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-selections']/j:map/j:[@key='description']"
+   <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/reviewed-controls/control-selection/description" -->
@@ -27925,16 +28577,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/reviewed-controls/control-selection/link/text" -->
@@ -27954,12 +28607,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -27990,7 +28644,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/include-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/include-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="include-control"
                 _key="include-controls"
@@ -28003,7 +28657,7 @@
          <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='include-controls']/j:map/j:array[@key='statement-ids']/j:"
+   <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/reviewed-controls/control-selection/include-control/statement-id" -->
@@ -28018,12 +28672,14 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -28034,7 +28690,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/reviewed-controls/control-selection/exclude-control"
                 _metaschema-json-id="/assembly/oscal-assessment-common/reviewed-controls/control-selections/exclude-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-control-by-id"
                 _step="exclude-control"
                 _key="exclude-controls"
@@ -28047,7 +28703,7 @@
          <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:"
+   <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" -->
@@ -28062,12 +28718,14 @@
              _in-xml-name="statement-id"
              _in-json-name="statement-ids"
              gi="statement-id"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -28093,7 +28751,7 @@
          <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:[@key='description']"
+   <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/reviewed-controls/control-objective-selection/description" -->
@@ -28114,16 +28772,17 @@
          <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-objective-selections']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/reviewed-controls/control-objective-selection/link/text" -->
@@ -28143,12 +28802,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -28189,7 +28849,7 @@
          <xsl:apply-templates select="*[@key='parts']"/>
       </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:[@key='text']"
+   <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/attestation/responsible-party/link/text" -->
@@ -28209,16 +28869,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='title']"
+   <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/attestation//part/title" -->
@@ -28238,20 +28899,21 @@
          <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:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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"
-                 priority="9">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/attestation//part" -->
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+   <!-- 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="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _key="prose"
              _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/p ul ol pre table h1 h2 h3 h4 h5 h6"
              _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/prose"
@@ -28262,21 +28924,16 @@
              key="prose"
              _using-name="prose"
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+             _in-json-name="prose">
+         <value as-type="markup-multiline"
+                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/p ul ol pre table h1 h2 h3 h4 h5 h6/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"
-                 mode="get-value-property"
-                 priority="9">
-      <value>
-         <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:array[@key='links']/j:map/j:[@key='text']"
+   <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" -->
@@ -28296,12 +28953,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -28350,7 +29008,7 @@
          <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:[@key='title']"
+   <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" -->
@@ -28370,16 +29028,17 @@
          <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:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='description']"
+   <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/assessment-log/entry/description" -->
@@ -28400,16 +29059,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='start']"
+   <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/assessment-log/entry/start" -->
@@ -28429,16 +29089,17 @@
          <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:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:[@key='start']"
+   <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>
+      <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:[@key='end']"
+   <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/assessment-log/entry/end" -->
@@ -28458,16 +29119,17 @@
          <xsl:if test="$with-key">
             <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:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:[@key='end']"
+   <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>
+      <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:[@key='text']"
+   <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/assessment-log/entry/link/text" -->
@@ -28487,16 +29149,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='text']"
+   <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/assessment-log/entry/related-task/link/text" -->
@@ -28516,16 +29179,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='text']"
+   <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/assessment-log/entry/related-task/responsible-party/link/text" -->
@@ -28545,16 +29209,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-parties']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='description']"
+   <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/assessment-log/entry/related-task/subject/description" -->
@@ -28575,16 +29240,17 @@
          <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:array[@key='subjects']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/assessment-log/entry/related-task/subject/link/text" -->
@@ -28604,12 +29270,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -28633,7 +29300,7 @@
          </xsl:if>
       </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:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/assessment-log/entry/related-task/subject/include-subject/link/text" -->
@@ -28653,16 +29320,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='text']"
+   <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/assessment-log/entry/related-task/subject/exclude-subject/link/text" -->
@@ -28682,12 +29350,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -28712,7 +29381,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -28733,16 +29402,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/assessment-log/entry/related-task/identified-subject/subject/link/text" -->
@@ -28762,12 +29432,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -28791,7 +29462,7 @@
          </xsl:if>
       </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:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/assessment-log/entry/related-task/identified-subject/subject/include-subject/link/text" -->
@@ -28811,16 +29482,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-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:[@key='text']"
+   <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/assessment-log/entry/related-task/identified-subject/subject/exclude-subject/link/text" -->
@@ -28840,16 +29512,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='title']"
+   <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/observation/title" -->
@@ -28869,16 +29542,17 @@
          <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:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='description']"
+   <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/observation/description" -->
@@ -28899,16 +29573,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/observation/link/text" -->
@@ -28928,16 +29603,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:"
+   <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/observation/method" -->
@@ -28952,16 +29628,18 @@
              _in-xml-name="method"
              _in-json-name="methods"
              gi="method"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:"
+   <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/observation/type" -->
@@ -28976,16 +29654,18 @@
              _in-xml-name="type"
              _in-json-name="types"
              gi="type"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='text']"
+   <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/observation/origin/actor/link/text" -->
@@ -29005,16 +29685,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/observation/origin/related-task/link/text" -->
@@ -29034,16 +29715,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/observation/origin/related-task/responsible-party/link/text" -->
@@ -29063,16 +29745,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='description']"
+   <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/observation/origin/related-task/subject/description" -->
@@ -29093,16 +29776,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/observation/origin/related-task/subject/link/text" -->
@@ -29122,12 +29806,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -29151,7 +29836,7 @@
          </xsl:if>
       </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:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/observation/origin/related-task/subject/include-subject/link/text" -->
@@ -29171,16 +29856,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/observation/origin/related-task/subject/exclude-subject/link/text" -->
@@ -29200,12 +29886,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -29230,7 +29917,7 @@
          <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:[@key='description']"
+   <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/observation/origin/related-task/identified-subject/subject/description" -->
@@ -29251,16 +29938,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -29280,12 +29968,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -29309,7 +29998,7 @@
          </xsl:if>
       </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:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/observation/origin/related-task/identified-subject/subject/include-subject/link/text" -->
@@ -29329,16 +30018,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/observation/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
@@ -29358,12 +30048,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -29374,7 +30065,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/observation/subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/observation/subjects"
                 name="subject-reference"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:subject-reference"
                 _step="subject"
                 _key="subjects"
@@ -29391,7 +30082,7 @@
          <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:[@key='title']"
+   <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/observation/subject/title" -->
@@ -29411,16 +30102,17 @@
          <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:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/observation/subject/link/text" -->
@@ -29440,12 +30132,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -29469,7 +30162,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -29490,16 +30183,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/observation/relevant-evidence/link/text" -->
@@ -29519,16 +30213,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='collected']"
+   <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/observation/collected" -->
@@ -29548,16 +30243,17 @@
          <xsl:if test="$with-key">
             <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:array[@key='observations']/j:map/j:[@key='collected']"
+   <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>
+      <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:[@key='expires']"
+   <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/observation/expires" -->
@@ -29577,16 +30273,17 @@
          <xsl:if test="$with-key">
             <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:array[@key='observations']/j:map/j:[@key='expires']"
+   <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>
+      <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:[@key='title']"
+   <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/risk/title" -->
@@ -29606,16 +30303,17 @@
          <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:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='description']"
+   <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/risk/description" -->
@@ -29636,16 +30334,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='statement']"
+   <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/risk/statement" -->
@@ -29666,16 +30365,17 @@
          <xsl:if test="$with-key">
             <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:array[@key='risks']/j:map/j:[@key='statement']"
+   <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>
+      <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:[@key='text']"
+   <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/risk/link/text" -->
@@ -29695,16 +30395,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='status']"
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:string[@key='status']"
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/status" -->
@@ -29724,16 +30425,17 @@
          <xsl:if test="$with-key">
             <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='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:[@key='status']"
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:string[@key='status']"
                  mode="get-value-property"
                  priority="7">
-      <value>
+      <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='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/risk/origin/actor/link/text" -->
@@ -29753,16 +30455,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/risk/origin/related-task/link/text" -->
@@ -29782,16 +30485,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/risk/origin/related-task/responsible-party/link/text" -->
@@ -29811,16 +30515,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='description']"
+   <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/risk/origin/related-task/subject/description" -->
@@ -29841,16 +30546,17 @@
          <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='subjects']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/risk/origin/related-task/subject/link/text" -->
@@ -29870,12 +30576,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -29899,7 +30606,7 @@
          </xsl:if>
       </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:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/risk/origin/related-task/subject/include-subject/link/text" -->
@@ -29919,16 +30626,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/risk/origin/related-task/subject/exclude-subject/link/text" -->
@@ -29948,12 +30656,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -29978,7 +30687,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -29999,16 +30708,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/risk/origin/related-task/identified-subject/subject/link/text" -->
@@ -30028,12 +30738,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -30057,7 +30768,7 @@
          </xsl:if>
       </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:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/risk/origin/related-task/identified-subject/subject/include-subject/link/text" -->
@@ -30077,16 +30788,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/risk/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
@@ -30106,16 +30818,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/risk/characterization/link/text" -->
@@ -30135,16 +30848,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/risk/characterization/origin/actor/link/text" -->
@@ -30164,16 +30878,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='actors']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/risk/characterization/origin/related-task/link/text" -->
@@ -30193,16 +30908,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/risk/characterization/origin/related-task/responsible-party/link/text" -->
@@ -30222,16 +30938,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='description']"
+   <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/risk/characterization/origin/related-task/subject/description" -->
@@ -30252,16 +30969,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/risk/characterization/origin/related-task/subject/link/text" -->
@@ -30281,12 +30999,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -30310,7 +31029,7 @@
          </xsl:if>
       </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='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/risk/characterization/origin/related-task/subject/include-subject/link/text" -->
@@ -30330,16 +31049,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/risk/characterization/origin/related-task/subject/exclude-subject/link/text" -->
@@ -30359,12 +31079,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -30389,7 +31110,7 @@
          <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:[@key='description']"
+   <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/risk/characterization/origin/related-task/identified-subject/subject/description" -->
@@ -30410,16 +31131,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/risk/characterization/origin/related-task/identified-subject/subject/link/text" -->
@@ -30439,12 +31161,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -30468,7 +31191,7 @@
          </xsl:if>
       </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:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/risk/characterization/origin/related-task/identified-subject/subject/include-subject/link/text" -->
@@ -30488,16 +31211,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/risk/characterization/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
@@ -30517,12 +31241,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -30547,7 +31272,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -30567,12 +31292,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -30597,7 +31323,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -30618,16 +31344,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -30647,12 +31374,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -30663,7 +31391,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/risk/mitigating-factor/subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/risk/mitigating-factors/subjects"
                 name="subject-reference"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:subject-reference"
                 _step="subject"
                 _key="subjects"
@@ -30680,7 +31408,7 @@
          <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:[@key='title']"
+   <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/risk/mitigating-factor/subject/title" -->
@@ -30700,16 +31428,17 @@
          <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:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/risk/mitigating-factor/subject/link/text" -->
@@ -30729,16 +31458,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='deadline']"
+   <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/risk/deadline" -->
@@ -30758,12 +31488,13 @@
          <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:[@key='deadline']"
+   <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>
+      <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -30774,7 +31505,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/risk/response"
                 _metaschema-json-id="/assembly/oscal-assessment-common/risk/remediations"
                 name="response"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:response"
                 _step="response"
                 _key="remediations"
@@ -30795,7 +31526,7 @@
          <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:[@key='title']"
+   <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/risk/response/title" -->
@@ -30815,16 +31546,17 @@
          <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:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='description']"
+   <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" -->
@@ -30845,16 +31577,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/risk/response/link/text" -->
@@ -30874,16 +31607,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/risk/response/origin/actor/link/text" -->
@@ -30903,16 +31637,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/risk/response/origin/related-task/link/text" -->
@@ -30932,16 +31667,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/response/origin/related-task/responsible-party/link/text" -->
@@ -30961,16 +31697,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='description']"
+   <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/response/origin/related-task/subject/description" -->
@@ -30991,16 +31728,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/response/origin/related-task/subject/link/text" -->
@@ -31020,12 +31758,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -31049,7 +31788,7 @@
          </xsl:if>
       </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:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/response/origin/related-task/subject/include-subject/link/text" -->
@@ -31069,16 +31808,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/response/origin/related-task/subject/exclude-subject/link/text" -->
@@ -31098,12 +31838,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -31128,7 +31869,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -31149,16 +31890,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/response/origin/related-task/identified-subject/subject/link/text" -->
@@ -31178,12 +31920,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -31207,7 +31950,7 @@
          </xsl:if>
       </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:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/response/origin/related-task/identified-subject/subject/include-subject/link/text" -->
@@ -31227,16 +31970,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/response/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
@@ -31256,12 +32000,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -31294,7 +32039,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/response/required-asset/subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/response/required-assets/subjects"
                 name="subject-reference"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:subject-reference"
                 _step="subject"
                 _key="subjects"
@@ -31311,7 +32056,7 @@
          <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:[@key='title']"
+   <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" -->
@@ -31331,16 +32076,17 @@
          <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:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/response/required-asset/subject/link/text" -->
@@ -31360,16 +32106,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='title']"
+   <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/response/required-asset/title" -->
@@ -31389,16 +32136,17 @@
          <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:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='description']"
+   <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/response/required-asset/description" -->
@@ -31419,16 +32167,17 @@
          <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='required-assets']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/response/required-asset/link/text" -->
@@ -31448,16 +32197,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='title']"
+   <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/response//task/title" -->
@@ -31477,16 +32227,17 @@
          <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='tasks']/j:map/j:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='description']"
+   <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/response//task/description" -->
@@ -31507,16 +32258,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/response//task/link/text" -->
@@ -31536,12 +32288,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -31670,7 +32423,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -31690,16 +32443,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/response//task/associated-activity/responsible-role/link/text" -->
@@ -31719,16 +32473,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='description']"
+   <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/response//task/associated-activity/subject/description" -->
@@ -31749,16 +32504,17 @@
          <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='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/response//task/associated-activity/subject/link/text" -->
@@ -31778,12 +32534,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -31807,7 +32564,7 @@
          </xsl:if>
       </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='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/response//task/associated-activity/subject/include-subject/link/text" -->
@@ -31827,16 +32584,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/response//task/associated-activity/subject/exclude-subject/link/text" -->
@@ -31856,16 +32614,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='description']"
+   <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" -->
@@ -31886,16 +32645,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/response//task/subject/link/text" -->
@@ -31915,12 +32675,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -31944,7 +32705,7 @@
          </xsl:if>
       </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='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/response//task/subject/include-subject/link/text" -->
@@ -31964,16 +32725,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/response//task/subject/exclude-subject/link/text" -->
@@ -31993,16 +32755,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/response//task/responsible-role/link/text" -->
@@ -32022,12 +32785,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -32077,7 +32841,7 @@
          <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:[@key='title']"
+   <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/risk-log/entry/title" -->
@@ -32097,16 +32861,17 @@
          <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:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='description']"
+   <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/risk-log/entry/description" -->
@@ -32127,16 +32892,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='start']"
+   <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" -->
@@ -32156,16 +32922,17 @@
          <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:[@key='start']"
+   <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>
+      <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:[@key='end']"
+   <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/risk-log/entry/end" -->
@@ -32185,16 +32952,17 @@
          <xsl:if test="$with-key">
             <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:map[@key='risk-log']/j:array[@key='entries']/j:map/j:[@key='end']"
+   <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>
+      <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:[@key='text']"
+   <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/risk-log/entry/link/text" -->
@@ -32214,12 +32982,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -32243,7 +33012,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -32263,16 +33032,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/risk-log/entry/related-response/related-task/link/text" -->
@@ -32292,16 +33062,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/risk-log/entry/related-response/related-task/responsible-party/link/text" -->
@@ -32321,16 +33092,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-parties']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='description']"
+   <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/risk-log/entry/related-response/related-task/subject/description" -->
@@ -32351,16 +33123,17 @@
          <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:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/risk-log/entry/related-response/related-task/subject/link/text" -->
@@ -32380,12 +33153,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -32409,7 +33183,7 @@
          </xsl:if>
       </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:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/risk-log/entry/related-response/related-task/subject/include-subject/link/text" -->
@@ -32429,16 +33203,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/risk-log/entry/related-response/related-task/subject/exclude-subject/link/text" -->
@@ -32458,12 +33233,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -32488,7 +33264,7 @@
          <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:[@key='description']"
+   <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/risk-log/entry/related-response/related-task/identified-subject/subject/description" -->
@@ -32509,16 +33285,17 @@
          <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: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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/risk-log/entry/related-response/related-task/identified-subject/subject/link/text" -->
@@ -32538,12 +33315,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -32567,7 +33345,7 @@
          </xsl:if>
       </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:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/risk-log/entry/related-response/related-task/identified-subject/subject/include-subject/link/text" -->
@@ -32587,16 +33365,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/risk-log/entry/related-response/related-task/identified-subject/subject/exclude-subject/link/text" -->
@@ -32616,12 +33395,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -32642,7 +33422,7 @@
          <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:[@key='title']"
+   <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/finding/title" -->
@@ -32662,16 +33442,17 @@
          <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='findings']/j:map/j:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='description']"
+   <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/finding/description" -->
@@ -32692,16 +33473,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/finding/link/text" -->
@@ -32721,16 +33503,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/finding/origin/actor/link/text" -->
@@ -32750,16 +33533,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/finding/origin/related-task/link/text" -->
@@ -32779,16 +33563,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/finding/origin/related-task/responsible-party/link/text" -->
@@ -32808,16 +33593,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-parties']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='description']"
+   <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/finding/origin/related-task/subject/description" -->
@@ -32838,16 +33624,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/finding/origin/related-task/subject/link/text" -->
@@ -32867,12 +33654,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -32896,7 +33684,7 @@
          </xsl:if>
       </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:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/finding/origin/related-task/subject/include-subject/link/text" -->
@@ -32916,16 +33704,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/finding/origin/related-task/subject/exclude-subject/link/text" -->
@@ -32945,12 +33734,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -32975,7 +33765,7 @@
          <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:[@key='description']"
+   <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/finding/origin/related-task/identified-subject/subject/description" -->
@@ -32996,16 +33786,17 @@
          <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:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/finding/origin/related-task/identified-subject/subject/link/text" -->
@@ -33025,12 +33816,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -33054,7 +33846,7 @@
          </xsl:if>
       </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:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/finding/origin/related-task/identified-subject/subject/include-subject/link/text" -->
@@ -33074,16 +33866,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='text']"
+   <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/finding/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
@@ -33103,16 +33896,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='title']"
+   <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/finding/target/title" -->
@@ -33132,16 +33926,17 @@
          <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='findings']/j:map/j:map[@key='target']/j:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='description']"
+   <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/finding/target/description" -->
@@ -33162,16 +33957,17 @@
          <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:map[@key='target']/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/finding/target/link/text" -->
@@ -33191,74 +33987,39 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:map[@key='target']/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <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:[@key='status']"
+   <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" -->
-      <field _step="status"
-             _key="status"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/finding-target/status"
-             _metaschema-json-id="/assembly/oscal-assessment-common/finding-target/status"
-             collapsible="no"
-             as-type="token"
-             name="status"
-             key="status"
-             _using-name="status"
-             _in-xml-name="status"
-             _in-json-name="status"
-             gi="status"
-             in-json="SCALAR">
+      <assembly _step="status"
+                _key="status"
+                _metaschema-xml-id="/assembly/oscal-assessment-common/finding-target/status"
+                _metaschema-json-id="/assembly/oscal-assessment-common/finding-target/status"
+                name="status"
+                key="status"
+                _using-name="status"
+                _in-xml-name="status"
+                _in-json-name="status"
+                gi="status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
-      </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:[@key='status']"
-                 mode="get-value-property"
-                 priority="8">
-      <value>
-         <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:[@key='reason']"
-                 priority="8">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/finding/target/reason" -->
-      <field _step="reason"
-             _key="reason"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/finding-target/reason"
-             _metaschema-json-id="/assembly/oscal-assessment-common/finding-target/reason"
-             collapsible="no"
-             as-type="NCName"
-             name="reason"
-             key="reason"
-             _using-name="reason"
-             _in-xml-name="reason"
-             _in-json-name="reason"
-             gi="reason"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">reason</xsl:attribute>
-         </xsl:if>
-      </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:[@key='reason']"
-                 mode="get-value-property"
-                 priority="8">
-      <value>
-         <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='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:[@key='implementation-statement-uuid']"
+   <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/finding/implementation-statement-uuid" -->
@@ -33278,12 +34039,13 @@
          <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:[@key='implementation-statement-uuid']"
+   <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>
+      <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -33345,7 +34107,7 @@
          <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:[@key='title']"
+   <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/back-matter/resource/title" -->
@@ -33365,16 +34127,17 @@
          <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='back-matter']/j:array[@key='resources']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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/back-matter/resource/description" -->
@@ -33395,12 +34158,13 @@
          <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='back-matter']/j:array[@key='resources']/j:map/j:[@key='description']"
+   <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>
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -33413,7 +34177,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -33455,7 +34219,7 @@
          <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:[@key='text']"
+   <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/back-matter/resource/citation/text" -->
@@ -33475,16 +34239,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/back-matter/resource/citation/link/text" -->
@@ -33504,12 +34269,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -33562,7 +34328,7 @@
          <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:[@key='title']"
+   <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="plan-of-action-and-milestones/metadata/title" -->
@@ -33582,16 +34348,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='published']"
+   <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="plan-of-action-and-milestones/metadata/published" -->
@@ -33601,7 +34368,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -33614,16 +34381,17 @@
          <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='plan-of-action-and-milestones']/j:map[@key='metadata']/j:[@key='published']"
+   <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>
+      <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:[@key='last-modified']"
+   <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="plan-of-action-and-milestones/metadata/last-modified" -->
@@ -33633,7 +34401,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -33646,16 +34414,17 @@
          <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='plan-of-action-and-milestones']/j:map[@key='metadata']/j:[@key='last-modified']"
+   <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>
+      <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:[@key='version']"
+   <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="plan-of-action-and-milestones/metadata/version" -->
@@ -33665,7 +34434,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -33678,16 +34447,17 @@
          <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='plan-of-action-and-milestones']/j:map[@key='metadata']/j:[@key='version']"
+   <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>
+      <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:[@key='oscal-version']"
+   <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="plan-of-action-and-milestones/metadata/oscal-version" -->
@@ -33697,7 +34467,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -33710,12 +34480,13 @@
          <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='plan-of-action-and-milestones']/j:map[@key='metadata']/j:[@key='oscal-version']"
+   <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>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -33726,7 +34497,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/revisions/revision"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/revisions"
                 name="revision"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:revision"
                 _step="revisions/revision"
                 _key="revisions"
@@ -33754,7 +34525,7 @@
              group-json="ARRAY"
              name="revision"
              key="revisions"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:revision"
              _key-ref="oscal-metadata:revision">
          <xsl:if test="$with-key">
@@ -33763,7 +34534,7 @@
          <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:[@key='title']"
+   <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" -->
@@ -33783,16 +34554,17 @@
          <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='revisions']/j:array[@key='revisions']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='published']"
+   <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="plan-of-action-and-milestones/metadata/revisions/revision/published" -->
@@ -33802,7 +34574,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -33815,16 +34587,17 @@
          <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='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='published']"
+   <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>
+      <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:[@key='last-modified']"
+   <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="plan-of-action-and-milestones/metadata/revisions/revision/last-modified" -->
@@ -33834,7 +34607,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -33847,16 +34620,17 @@
          <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='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='last-modified']"
+   <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>
+      <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:[@key='version']"
+   <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="plan-of-action-and-milestones/metadata/revisions/revision/version" -->
@@ -33866,7 +34640,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -33879,16 +34653,17 @@
          <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='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='version']"
+   <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>
+      <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:[@key='oscal-version']"
+   <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="plan-of-action-and-milestones/metadata/revisions/revision/oscal-version" -->
@@ -33898,7 +34673,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -33911,16 +34686,17 @@
          <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='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='oscal-version']"
+   <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>
+      <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:[@key='text']"
+   <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="plan-of-action-and-milestones/metadata/revisions/revision/link/text" -->
@@ -33940,12 +34716,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -33958,7 +34735,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -33978,7 +34755,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -33998,16 +34775,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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" -->
@@ -34027,16 +34805,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='short-name']"
+   <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="plan-of-action-and-milestones/metadata/role/short-name" -->
@@ -34056,16 +34835,17 @@
          <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='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:[@key='short-name']"
+   <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>
+      <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:[@key='description']"
+   <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="plan-of-action-and-milestones/metadata/role/description" -->
@@ -34086,16 +34866,17 @@
          <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='metadata']/j:array[@key='roles']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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="plan-of-action-and-milestones/metadata/role/link/text" -->
@@ -34115,16 +34896,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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" -->
@@ -34144,12 +34926,13 @@
          <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:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -34161,7 +34944,7 @@
                 _metaschema-json-id="/assembly/oscal-metadata/location/address"
                 name="address"
                 key="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="address"
@@ -34181,7 +34964,7 @@
          <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:"
+   <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" -->
@@ -34190,7 +34973,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -34199,16 +34982,18 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='city']"
+   <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="plan-of-action-and-milestones/metadata/location/address/city" -->
@@ -34228,16 +35013,17 @@
          <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='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:[@key='city']"
+   <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>
+      <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:[@key='state']"
+   <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="plan-of-action-and-milestones/metadata/location/address/state" -->
@@ -34257,16 +35043,17 @@
          <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='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:[@key='state']"
+   <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>
+      <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:[@key='postal-code']"
+   <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="plan-of-action-and-milestones/metadata/location/address/postal-code" -->
@@ -34286,16 +35073,17 @@
          <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='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:[@key='postal-code']"
+   <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>
+      <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:[@key='country']"
+   <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="plan-of-action-and-milestones/metadata/location/address/country" -->
@@ -34315,16 +35103,17 @@
          <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='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:[@key='country']"
+   <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>
+      <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:"
+   <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="plan-of-action-and-milestones/metadata/location/email-address" -->
@@ -34333,7 +35122,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -34342,12 +35131,14 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -34360,7 +35151,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -34380,7 +35171,7 @@
          <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:"
+   <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="plan-of-action-and-milestones/metadata/location/url" -->
@@ -34395,16 +35186,18 @@
              _in-xml-name="url"
              _in-json-name="urls"
              gi="url"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='text']"
+   <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="plan-of-action-and-milestones/metadata/location/link/text" -->
@@ -34424,16 +35217,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='name']"
+   <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="plan-of-action-and-milestones/metadata/party/name" -->
@@ -34453,16 +35247,17 @@
          <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='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:[@key='name']"
+   <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>
+      <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:[@key='short-name']"
+   <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="plan-of-action-and-milestones/metadata/party/short-name" -->
@@ -34482,12 +35277,13 @@
          <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='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:[@key='short-name']"
+   <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>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -34517,7 +35313,7 @@
          <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:[@key='text']"
+   <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="plan-of-action-and-milestones/metadata/party/link/text" -->
@@ -34537,16 +35333,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <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:"
+   <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="plan-of-action-and-milestones/metadata/party/email-address" -->
@@ -34555,7 +35352,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -34564,12 +35361,14 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -34582,7 +35381,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -34609,7 +35408,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/party/address"
                 _metaschema-json-id="/assembly/oscal-metadata/party/addresses"
                 name="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="addresses"
@@ -34626,7 +35425,7 @@
          <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:"
+   <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="plan-of-action-and-milestones/metadata/party/address/addr-line" -->
@@ -34635,7 +35434,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -34644,16 +35443,18 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='city']"
+   <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/party/address/city" -->
@@ -34673,16 +35474,17 @@
          <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='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:[@key='city']"
+   <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>
+      <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:[@key='state']"
+   <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/party/address/state" -->
@@ -34702,16 +35504,17 @@
          <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='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:[@key='state']"
+   <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>
+      <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:[@key='postal-code']"
+   <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/party/address/postal-code" -->
@@ -34731,16 +35534,17 @@
          <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='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:[@key='postal-code']"
+   <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>
+      <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:[@key='country']"
+   <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/party/address/country" -->
@@ -34760,16 +35564,17 @@
          <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='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:[@key='country']"
+   <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>
+      <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:"
+   <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" -->
@@ -34784,16 +35589,18 @@
              _in-xml-name="member-of-organization"
              _in-json-name="member-of-organizations"
              gi="member-of-organization"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='text']"
+   <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/responsible-party/link/text" -->
@@ -34813,16 +35620,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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/local-definitions/component/title" -->
@@ -34842,16 +35650,17 @@
          <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:array[@key='components']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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/local-definitions/component/description" -->
@@ -34872,16 +35681,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='purpose']"
+   <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/local-definitions/component/purpose" -->
@@ -34901,16 +35711,17 @@
          <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:array[@key='components']/j:map/j:[@key='purpose']"
+   <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>
+      <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:[@key='text']"
+   <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/local-definitions/component/link/text" -->
@@ -34930,12 +35741,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -34960,7 +35772,7 @@
          <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:[@key='text']"
+   <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/local-definitions/component/responsible-role/link/text" -->
@@ -34980,16 +35792,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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/local-definitions/component/protocol/title" -->
@@ -35009,16 +35822,17 @@
          <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:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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/local-definitions/inventory-item/description" -->
@@ -35039,16 +35853,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/local-definitions/inventory-item/link/text" -->
@@ -35068,16 +35883,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/local-definitions/inventory-item/responsible-party/link/text" -->
@@ -35097,12 +35913,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-parties']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -35126,7 +35943,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -35146,16 +35963,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='implemented-components']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/local-definitions/inventory-item/implemented-component/responsible-party/link/text" -->
@@ -35175,16 +35993,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='implemented-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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/observation/title" -->
@@ -35204,16 +36023,17 @@
          <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='observations']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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/observation/description" -->
@@ -35234,16 +36054,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/observation/link/text" -->
@@ -35263,16 +36084,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:"
+   <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" -->
@@ -35287,16 +36109,18 @@
              _in-xml-name="method"
              _in-json-name="methods"
              gi="method"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:"
+   <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" -->
@@ -35311,16 +36135,18 @@
              _in-xml-name="type"
              _in-json-name="types"
              gi="type"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='text']"
+   <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/observation/origin/actor/link/text" -->
@@ -35340,16 +36166,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/observation/origin/related-task/link/text" -->
@@ -35369,16 +36196,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/observation/origin/related-task/responsible-party/link/text" -->
@@ -35398,16 +36226,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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/observation/origin/related-task/subject/description" -->
@@ -35428,16 +36257,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/observation/origin/related-task/subject/link/text" -->
@@ -35457,12 +36287,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -35486,7 +36317,7 @@
          </xsl:if>
       </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:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/observation/origin/related-task/subject/include-subject/link/text" -->
@@ -35506,16 +36337,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/observation/origin/related-task/subject/exclude-subject/link/text" -->
@@ -35535,12 +36367,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -35565,7 +36398,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -35586,16 +36419,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/observation/origin/related-task/identified-subject/subject/link/text" -->
@@ -35615,12 +36449,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -35644,7 +36479,7 @@
          </xsl:if>
       </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:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/observation/origin/related-task/identified-subject/subject/include-subject/link/text" -->
@@ -35664,16 +36499,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/observation/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
@@ -35693,12 +36529,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -35709,7 +36546,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/observation/subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/observation/subjects"
                 name="subject-reference"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:subject-reference"
                 _step="subject"
                 _key="subjects"
@@ -35726,7 +36563,7 @@
          <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:[@key='title']"
+   <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/observation/subject/title" -->
@@ -35746,16 +36583,17 @@
          <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='observations']/j:map/j:array[@key='subjects']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='text']"
+   <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/observation/subject/link/text" -->
@@ -35775,12 +36613,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -35804,7 +36643,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -35825,16 +36664,17 @@
          <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='relevant-evidence']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/observation/relevant-evidence/link/text" -->
@@ -35854,16 +36694,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='collected']"
+   <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/observation/collected" -->
@@ -35883,16 +36724,17 @@
          <xsl:if test="$with-key">
             <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:array[@key='observations']/j:map/j:[@key='collected']"
+   <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>
+      <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:[@key='expires']"
+   <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/observation/expires" -->
@@ -35912,16 +36754,17 @@
          <xsl:if test="$with-key">
             <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:array[@key='observations']/j:map/j:[@key='expires']"
+   <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>
+      <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:[@key='title']"
+   <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/risk/title" -->
@@ -35941,16 +36784,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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/risk/description" -->
@@ -35971,16 +36815,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='statement']"
+   <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/risk/statement" -->
@@ -36001,16 +36846,17 @@
          <xsl:if test="$with-key">
             <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='risks']/j:map/j:[@key='statement']"
+   <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>
+      <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:[@key='text']"
+   <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/risk/link/text" -->
@@ -36030,16 +36876,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='status']"
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:string[@key='status']"
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/status" -->
@@ -36059,16 +36906,17 @@
          <xsl:if test="$with-key">
             <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:[@key='status']"
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:string[@key='status']"
                  mode="get-value-property"
                  priority="5">
-      <value>
+      <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='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/risk/origin/actor/link/text" -->
@@ -36088,16 +36936,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/risk/origin/related-task/link/text" -->
@@ -36117,16 +36966,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/risk/origin/related-task/responsible-party/link/text" -->
@@ -36146,16 +36996,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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/risk/origin/related-task/subject/description" -->
@@ -36176,16 +37027,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/risk/origin/related-task/subject/link/text" -->
@@ -36205,12 +37057,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -36234,7 +37087,7 @@
          </xsl:if>
       </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:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/risk/origin/related-task/subject/include-subject/link/text" -->
@@ -36254,16 +37107,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/risk/origin/related-task/subject/exclude-subject/link/text" -->
@@ -36283,12 +37137,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -36313,7 +37168,7 @@
          <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:[@key='description']"
+   <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/risk/origin/related-task/identified-subject/subject/description" -->
@@ -36334,16 +37189,17 @@
          <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:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/risk/origin/related-task/identified-subject/subject/link/text" -->
@@ -36363,12 +37219,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -36392,7 +37249,7 @@
          </xsl:if>
       </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:[@key='text']"
+   <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/risk/origin/related-task/identified-subject/subject/include-subject/link/text" -->
@@ -36412,16 +37269,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/risk/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
@@ -36441,16 +37299,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/risk/characterization/link/text" -->
@@ -36470,16 +37329,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/risk/characterization/origin/actor/link/text" -->
@@ -36499,16 +37359,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/risk/characterization/origin/related-task/link/text" -->
@@ -36528,16 +37389,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/risk/characterization/origin/related-task/responsible-party/link/text" -->
@@ -36557,16 +37419,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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/risk/characterization/origin/related-task/subject/description" -->
@@ -36587,16 +37450,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/risk/characterization/origin/related-task/subject/link/text" -->
@@ -36616,12 +37480,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -36645,7 +37510,7 @@
          </xsl:if>
       </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:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/characterization/origin/related-task/subject/include-subject/link/text" -->
@@ -36665,16 +37530,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/characterization/origin/related-task/subject/exclude-subject/link/text" -->
@@ -36694,12 +37560,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -36724,7 +37591,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -36745,16 +37612,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/characterization/origin/related-task/identified-subject/subject/link/text" -->
@@ -36774,12 +37642,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -36803,7 +37672,7 @@
          </xsl:if>
       </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:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/characterization/origin/related-task/identified-subject/subject/include-subject/link/text" -->
@@ -36823,16 +37692,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/characterization/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
@@ -36852,12 +37722,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -36882,7 +37753,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -36902,12 +37773,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -36932,7 +37804,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -36953,16 +37825,17 @@
          <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='mitigating-factors']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/mitigating-factor/link/text" -->
@@ -36982,12 +37855,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -36998,7 +37872,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/risk/mitigating-factor/subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/risk/mitigating-factors/subjects"
                 name="subject-reference"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:subject-reference"
                 _step="subject"
                 _key="subjects"
@@ -37015,7 +37889,7 @@
          <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:[@key='title']"
+   <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" -->
@@ -37035,16 +37909,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='text']"
+   <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/mitigating-factor/subject/link/text" -->
@@ -37064,16 +37939,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='deadline']"
+   <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/deadline" -->
@@ -37093,12 +37969,13 @@
          <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='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:[@key='deadline']"
+   <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>
+      <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -37109,7 +37986,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/risk/response"
                 _metaschema-json-id="/assembly/oscal-assessment-common/risk/remediations"
                 name="response"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:response"
                 _step="response"
                 _key="remediations"
@@ -37130,7 +38007,7 @@
          <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:[@key='title']"
+   <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/response/title" -->
@@ -37150,16 +38027,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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/response/description" -->
@@ -37180,16 +38058,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/response/link/text" -->
@@ -37209,16 +38088,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/response/origin/actor/link/text" -->
@@ -37238,16 +38118,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='actors']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/response/origin/related-task/link/text" -->
@@ -37267,16 +38148,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/response/origin/related-task/responsible-party/link/text" -->
@@ -37296,16 +38178,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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/response/origin/related-task/subject/description" -->
@@ -37326,16 +38209,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/response/origin/related-task/subject/link/text" -->
@@ -37355,12 +38239,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -37384,7 +38269,7 @@
          </xsl:if>
       </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='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/response/origin/related-task/subject/include-subject/link/text" -->
@@ -37404,16 +38289,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/response/origin/related-task/subject/exclude-subject/link/text" -->
@@ -37433,12 +38319,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -37463,7 +38350,7 @@
          <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:[@key='description']"
+   <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/response/origin/related-task/identified-subject/subject/description" -->
@@ -37484,16 +38371,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/response/origin/related-task/identified-subject/subject/link/text" -->
@@ -37513,12 +38401,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -37542,7 +38431,7 @@
          </xsl:if>
       </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:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/response/origin/related-task/identified-subject/subject/include-subject/link/text" -->
@@ -37562,16 +38451,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/response/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
@@ -37591,12 +38481,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -37629,7 +38520,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/response/required-asset/subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/response/required-assets/subjects"
                 name="subject-reference"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:subject-reference"
                 _step="subject"
                 _key="subjects"
@@ -37646,7 +38537,7 @@
          <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:[@key='title']"
+   <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/response/required-asset/subject/title" -->
@@ -37666,16 +38557,17 @@
          <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:array[@key='subjects']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='text']"
+   <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/response/required-asset/subject/link/text" -->
@@ -37695,16 +38587,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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/response/required-asset/title" -->
@@ -37724,16 +38617,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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/response/required-asset/description" -->
@@ -37754,16 +38648,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/response/required-asset/link/text" -->
@@ -37783,16 +38678,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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//task/title" -->
@@ -37812,16 +38708,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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" -->
@@ -37842,16 +38739,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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//task/link/text" -->
@@ -37871,12 +38769,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -38005,7 +38904,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -38025,16 +38924,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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//task/associated-activity/responsible-role/link/text" -->
@@ -38054,16 +38954,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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//task/associated-activity/subject/description" -->
@@ -38084,16 +38985,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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//task/associated-activity/subject/link/text" -->
@@ -38113,12 +39015,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -38142,7 +39045,7 @@
          </xsl:if>
       </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='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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//task/associated-activity/subject/include-subject/link/text" -->
@@ -38162,16 +39065,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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//task/associated-activity/subject/exclude-subject/link/text" -->
@@ -38191,16 +39095,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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//task/subject/description" -->
@@ -38221,16 +39126,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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//task/subject/link/text" -->
@@ -38250,12 +39156,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -38279,7 +39186,7 @@
          </xsl:if>
       </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='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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//task/subject/include-subject/link/text" -->
@@ -38299,16 +39206,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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//task/subject/exclude-subject/link/text" -->
@@ -38328,16 +39236,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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//task/responsible-role/link/text" -->
@@ -38357,12 +39266,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -38412,7 +39322,7 @@
          <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:[@key='title']"
+   <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/risk-log/entry/title" -->
@@ -38432,16 +39342,17 @@
          <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:map[@key='risk-log']/j:array[@key='entries']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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/risk-log/entry/description" -->
@@ -38462,16 +39373,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='start']"
+   <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/risk-log/entry/start" -->
@@ -38491,16 +39403,17 @@
          <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='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:[@key='start']"
+   <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>
+      <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:[@key='end']"
+   <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/risk-log/entry/end" -->
@@ -38520,16 +39433,17 @@
          <xsl:if test="$with-key">
             <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:map[@key='risk-log']/j:array[@key='entries']/j:map/j:[@key='end']"
+   <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>
+      <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:[@key='text']"
+   <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/risk-log/entry/link/text" -->
@@ -38549,12 +39463,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -38578,7 +39493,7 @@
          <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:[@key='text']"
+   <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/risk-log/entry/related-response/link/text" -->
@@ -38598,16 +39513,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/risk-log/entry/related-response/related-task/link/text" -->
@@ -38627,16 +39543,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/risk-log/entry/related-response/related-task/responsible-party/link/text" -->
@@ -38656,16 +39573,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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/risk-log/entry/related-response/related-task/subject/description" -->
@@ -38686,16 +39604,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/risk-log/entry/related-response/related-task/subject/link/text" -->
@@ -38715,12 +39634,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -38744,7 +39664,7 @@
          </xsl:if>
       </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:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/risk-log/entry/related-response/related-task/subject/include-subject/link/text" -->
@@ -38764,16 +39684,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/risk-log/entry/related-response/related-task/subject/exclude-subject/link/text" -->
@@ -38793,12 +39714,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -38823,7 +39745,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -38844,16 +39766,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/risk-log/entry/related-response/related-task/identified-subject/subject/link/text" -->
@@ -38873,12 +39796,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -38902,7 +39826,7 @@
          </xsl:if>
       </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='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/risk-log/entry/related-response/related-task/identified-subject/subject/include-subject/link/text" -->
@@ -38922,16 +39846,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/risk-log/entry/related-response/related-task/identified-subject/subject/exclude-subject/link/text" -->
@@ -38951,12 +39876,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -38977,7 +39903,7 @@
          <xsl:apply-templates select="*[@key='observation-uuid']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:[@key='title']"
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:string[@key='title']"
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/poam-item/title" -->
@@ -38997,16 +39923,17 @@
          <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='poam-items']/j:map/j:[@key='title']"
+   <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">
-      <value>
+      <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:[@key='description']"
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:string[@key='description']"
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/poam-item/description" -->
@@ -39027,16 +39954,17 @@
          <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='poam-items']/j:map/j:[@key='description']"
+   <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">
-      <value>
+      <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:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/poam-item/link/text" -->
@@ -39056,12 +39984,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='poam-items']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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">
-      <value>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -39081,7 +40010,7 @@
          <xsl:apply-templates select="*[@key='actors']"/>
       </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:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/poam-item/origin/actor/link/text" -->
@@ -39101,12 +40030,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='poam-items']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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">
-      <value>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -39168,7 +40098,7 @@
          <xsl:apply-templates select="*[@key='remarks']"/>
       </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:[@key='title']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource/title" -->
@@ -39188,16 +40118,17 @@
          <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='back-matter']/j:array[@key='resources']/j:map/j:[@key='title']"
+   <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">
-      <value>
+      <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:[@key='description']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource/description" -->
@@ -39218,12 +40149,13 @@
          <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='back-matter']/j:array[@key='resources']/j:map/j:[@key='description']"
+   <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">
-      <value>
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -39236,7 +40168,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -39278,7 +40210,7 @@
          <xsl:apply-templates select="*[@key='links']"/>
       </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:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource/citation/text" -->
@@ -39298,16 +40230,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:[@key='text']"
+   <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">
-      <value>
+      <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:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource/citation/link/text" -->
@@ -39327,12 +40260,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:[@key='text']"
+   <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">
-      <value>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -39422,11 +40356,11 @@
       <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"/>
diff --git a/xml/convert/oscal_component_json-to-xml-converter.xsl b/xml/convert/oscal_component_json-to-xml-converter.xsl
index 1bb0386fbd..6364d31e8d 100644
--- a/xml/convert/oscal_component_json-to-xml-converter.xsl
+++ b/xml/convert/oscal_component_json-to-xml-converter.xsl
@@ -78,7 +78,7 @@
                 _metaschema-json-id="/assembly/oscal-component-definition/component-definition"
                 name="component-definition"
                 key="component-definition"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:component-definition"
                 _using-root-name="component-definition"
                 gi="component-definition">
@@ -103,7 +103,7 @@
                 _metaschema-json-id="/assembly/oscal-component-definition/component-definition/metadata"
                 name="metadata"
                 key="metadata"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:metadata"
                 _step="metadata"
                 _key="metadata"
@@ -137,7 +137,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/revision/prop"
                 _metaschema-json-id="/assembly/oscal-metadata/revision/props"
                 name="property"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:property"
                 _step="prop"
                 _key="props"
@@ -160,7 +160,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/revision/link"
                 _metaschema-json-id="/assembly/oscal-metadata/revision/links"
                 name="link"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:link"
                 _step="link"
                 _key="links"
@@ -181,7 +181,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/role"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/roles"
                 name="role"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:role"
                 _step="role"
                 _key="roles"
@@ -205,7 +205,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/location"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/locations"
                 name="location"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:location"
                 _step="location"
                 _key="locations"
@@ -231,7 +231,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/party"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/parties"
                 name="party"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:party"
                 _step="party"
                 _key="parties"
@@ -261,7 +261,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/responsible-party"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/responsible-parties"
                 name="responsible-party"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:responsible-party"
                 _step="responsible-party"
                 _key="responsible-parties"
@@ -284,7 +284,7 @@
                 _metaschema-xml-id="/assembly/oscal-component-definition/component-definition/import-component-definition"
                 _metaschema-json-id="/assembly/oscal-component-definition/component-definition/import-component-definitions"
                 name="import-component-definition"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:import-component-definition"
                 _step="import-component-definition"
                 _key="import-component-definitions"
@@ -302,7 +302,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/component-definition/component"
                 _metaschema-json-id="/assembly/oscal-component-definition/component-definition/components"
                 name="defined-component"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:defined-component"
                 _step="component"
                 _key="components"
@@ -330,7 +330,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/defined-component/responsible-role"
                 _metaschema-json-id="/assembly/oscal-component-definition/defined-component/responsible-roles"
                 name="responsible-role"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:responsible-role"
                 _step="responsible-role"
                 _key="responsible-roles"
@@ -352,7 +352,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/defined-component/protocol"
                 _metaschema-json-id="/assembly/oscal-component-definition/defined-component/protocols"
                 name="protocol"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:protocol"
                 _step="protocol"
                 _key="protocols"
@@ -374,7 +374,7 @@
                 _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/port-range"
                 _metaschema-json-id="/assembly/oscal-implementation-common/protocol/port-ranges"
                 name="port-range"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:port-range"
                 _step="port-range"
                 _key="port-ranges"
@@ -394,7 +394,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/control-implementation/set-parameter"
                 _metaschema-json-id="/assembly/oscal-component-definition/control-implementation/set-parameters"
                 name="set-parameter"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:set-parameter"
                 _step="set-parameter"
                 _key="set-parameters"
@@ -414,7 +414,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/component-definition/capability"
                 _metaschema-json-id="/assembly/oscal-component-definition/component-definition/capabilities"
                 name="capability"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:capability"
                 _step="capability"
                 _key="capabilities"
@@ -439,7 +439,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/capability/incorporates-component"
                 _metaschema-json-id="/assembly/oscal-component-definition/capability/incorporates-components"
                 name="incorporates-component"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:incorporates-component"
                 _step="incorporates-component"
                 _key="incorporates-components"
@@ -459,7 +459,7 @@
                 _metaschema-json-id="/assembly/oscal-component-definition/component-definition/back-matter"
                 name="back-matter"
                 key="back-matter"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:back-matter"
                 _step="back-matter"
                 _key="back-matter"
@@ -474,7 +474,7 @@
          <xsl:apply-templates select="*[@key='resources']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:[@key='remarks']">
+   <xsl:template match="j:string[@key='remarks']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="remarks" -->
       <field _metaschema-xml-id="/assembly/oscal-metadata/property/remarks"
@@ -484,7 +484,7 @@
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:remarks"
              _step="remarks"
              _key="remarks"
@@ -497,14 +497,17 @@
          <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:[@key='remarks']" mode="get-value-property" priority="8">
-      <value>
+   <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:">
+   <xsl:template match="j:array[@key='location-uuids']/j:string">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="location-uuid" -->
       <field _metaschema-xml-id="/assembly/oscal-metadata/party/location-uuid"
@@ -512,7 +515,7 @@
              collapsible="no"
              as-type="uuid"
              name="location-uuid"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:location-uuid"
              _step="location-uuid"
              _key="location-uuids"
@@ -521,16 +524,18 @@
              _in-xml-name="location-uuid"
              _in-json-name="location-uuids"
              gi="location-uuid"
-             in-json="SCALAR"/>
+             in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="j:array[@key='location-uuids']/j:"
+   <xsl:template match="j:array[@key='location-uuids']/j:string"
                  mode="get-value-property"
                  priority="8">
-      <value>
+      <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:array[@key='party-uuids']/j:">
+   <xsl:template match="j:array[@key='party-uuids']/j:string">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="party-uuid" -->
       <field _metaschema-xml-id="/assembly/oscal-metadata/responsible-party/party-uuid"
@@ -538,7 +543,7 @@
              collapsible="no"
              as-type="uuid"
              name="party-uuid"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:party-uuid"
              _step="party-uuid"
              _key="party-uuids"
@@ -547,12 +552,14 @@
              _in-xml-name="party-uuid"
              _in-json-name="party-uuids"
              gi="party-uuid"
-             in-json="SCALAR"/>
+             in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="j:array[@key='party-uuids']/j:"
+   <xsl:template match="j:array[@key='party-uuids']/j:string"
                  mode="get-value-property"
                  priority="7">
-      <value>
+      <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -564,7 +571,7 @@
              collapsible="no"
              as-type="string"
              name="hash"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:hash"
              _step="hash"
              _key="hashes"
@@ -742,7 +749,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/link/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -822,7 +829,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/address/type"
             name="location-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:location-type"
             _step="type"
             _key="type"
@@ -979,7 +986,7 @@
             _metaschema-json-id="/assembly/oscal-component-definition/defined-component/type"
             name="defined-component-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
             _key-name="oscal-component-definition:defined-component-type"
             _step="type"
             _key="type"
@@ -1135,7 +1142,7 @@
             _metaschema-json-id="/assembly/oscal-component-definition/control-implementation/source"
             name="source"
             key="source"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
             _key-name="oscal-implementation-common:source"
             _step="source"
             _key="source"
@@ -1157,7 +1164,7 @@
             _metaschema-json-id="/assembly/oscal-implementation-common/set-parameter/param-id"
             name="param-id"
             key="param-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
             _key-name="oscal-implementation-common:param-id"
             _step="param-id"
             _key="param-id"
@@ -1199,7 +1206,7 @@
             _metaschema-json-id="/assembly/oscal-component-definition/implemented-requirement/control-id"
             name="control-id"
             key="control-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
             _key-name="oscal-catalog-common:control-id"
             _step="control-id"
             _key="control-id"
@@ -1221,7 +1228,7 @@
             _metaschema-json-id="/assembly/oscal-component-definition/statement/statement-id"
             name="statement-id"
             key="statement-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
             _key-name="oscal-implementation-common:statement-id"
             _step="statement-id"
             _key="statement-id"
@@ -1360,7 +1367,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -1421,7 +1428,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -1436,7 +1443,7 @@
    <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>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:[@key='title']"
+   <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/metadata/title" -->
@@ -1456,16 +1463,17 @@
          <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:[@key='title']"
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:string[@key='title']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='published']"
+   <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/metadata/published" -->
@@ -1475,7 +1483,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -1488,16 +1496,17 @@
          <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='component-definition']/j:map[@key='metadata']/j:[@key='published']"
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:string[@key='published']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='last-modified']"
+   <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/metadata/last-modified" -->
@@ -1507,7 +1516,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -1520,16 +1529,17 @@
          <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='component-definition']/j:map[@key='metadata']/j:[@key='last-modified']"
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:string[@key='last-modified']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='version']"
+   <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/metadata/version" -->
@@ -1539,7 +1549,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -1552,16 +1562,17 @@
          <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:map[@key='metadata']/j:[@key='version']"
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:string[@key='version']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='oscal-version']"
+   <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/metadata/oscal-version" -->
@@ -1571,7 +1582,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -1584,12 +1595,13 @@
          <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='component-definition']/j:map[@key='metadata']/j:[@key='oscal-version']"
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:string[@key='oscal-version']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -1600,7 +1612,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/revisions/revision"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/revisions"
                 name="revision"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:revision"
                 _step="revisions/revision"
                 _key="revisions"
@@ -1628,7 +1640,7 @@
              group-json="ARRAY"
              name="revision"
              key="revisions"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:revision"
              _key-ref="oscal-metadata:revision">
          <xsl:if test="$with-key">
@@ -1637,7 +1649,7 @@
          <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:[@key='title']"
+   <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" -->
@@ -1657,16 +1669,17 @@
          <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='revisions']/j:array[@key='revisions']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='published']"
+   <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/metadata/revisions/revision/published" -->
@@ -1676,7 +1689,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -1689,16 +1702,17 @@
          <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='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='published']"
+   <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>
+      <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:[@key='last-modified']"
+   <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/metadata/revisions/revision/last-modified" -->
@@ -1708,7 +1722,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -1721,16 +1735,17 @@
          <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='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='last-modified']"
+   <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>
+      <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:[@key='version']"
+   <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/metadata/revisions/revision/version" -->
@@ -1740,7 +1755,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -1753,16 +1768,17 @@
          <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:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='version']"
+   <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>
+      <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:[@key='oscal-version']"
+   <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/metadata/revisions/revision/oscal-version" -->
@@ -1772,7 +1788,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -1785,16 +1801,17 @@
          <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='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='oscal-version']"
+   <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>
+      <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:[@key='text']"
+   <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/metadata/revisions/revision/link/text" -->
@@ -1814,12 +1831,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -1832,7 +1850,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -1852,7 +1870,7 @@
          <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:[@key='text']"
+   <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/metadata/link/text" -->
@@ -1872,16 +1890,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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/metadata/role/title" -->
@@ -1901,16 +1920,17 @@
          <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='roles']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='short-name']"
+   <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/metadata/role/short-name" -->
@@ -1930,16 +1950,17 @@
          <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='component-definition']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:[@key='short-name']"
+   <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>
+      <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:[@key='description']"
+   <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/metadata/role/description" -->
@@ -1960,16 +1981,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -1989,16 +2011,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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/metadata/location/title" -->
@@ -2018,12 +2041,13 @@
          <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:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -2035,7 +2059,7 @@
                 _metaschema-json-id="/assembly/oscal-metadata/location/address"
                 name="address"
                 key="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="address"
@@ -2055,7 +2079,7 @@
          <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:"
+   <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" -->
@@ -2064,7 +2088,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -2073,16 +2097,18 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='city']"
+   <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/metadata/location/address/city" -->
@@ -2102,16 +2128,17 @@
          <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='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:[@key='city']"
+   <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>
+      <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:[@key='state']"
+   <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/metadata/location/address/state" -->
@@ -2131,16 +2158,17 @@
          <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='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:[@key='state']"
+   <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>
+      <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:[@key='postal-code']"
+   <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/metadata/location/address/postal-code" -->
@@ -2160,16 +2188,17 @@
          <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='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:[@key='postal-code']"
+   <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>
+      <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:[@key='country']"
+   <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/metadata/location/address/country" -->
@@ -2189,16 +2218,17 @@
          <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='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:[@key='country']"
+   <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>
+      <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:"
+   <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/metadata/location/email-address" -->
@@ -2207,7 +2237,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -2216,12 +2246,14 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -2234,7 +2266,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -2254,7 +2286,7 @@
          <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:"
+   <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="component-definition/metadata/location/url" -->
@@ -2269,16 +2301,18 @@
              _in-xml-name="url"
              _in-json-name="urls"
              gi="url"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='text']"
+   <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="component-definition/metadata/location/link/text" -->
@@ -2298,16 +2332,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='name']"
+   <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" -->
@@ -2327,16 +2362,17 @@
          <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='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:[@key='name']"
+   <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>
+      <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:[@key='short-name']"
+   <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="component-definition/metadata/party/short-name" -->
@@ -2356,12 +2392,13 @@
          <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='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:[@key='short-name']"
+   <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>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -2391,7 +2428,7 @@
          <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:[@key='text']"
+   <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="component-definition/metadata/party/link/text" -->
@@ -2411,16 +2448,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:"
+   <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="component-definition/metadata/party/email-address" -->
@@ -2429,7 +2467,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -2438,12 +2476,14 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -2456,7 +2496,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -2483,7 +2523,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/party/address"
                 _metaschema-json-id="/assembly/oscal-metadata/party/addresses"
                 name="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="addresses"
@@ -2500,7 +2540,7 @@
          <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:"
+   <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" -->
@@ -2509,7 +2549,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -2518,16 +2558,18 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='city']"
+   <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="component-definition/metadata/party/address/city" -->
@@ -2547,16 +2589,17 @@
          <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='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:[@key='city']"
+   <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>
+      <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:[@key='state']"
+   <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="component-definition/metadata/party/address/state" -->
@@ -2576,16 +2619,17 @@
          <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='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:[@key='state']"
+   <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>
+      <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:[@key='postal-code']"
+   <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="component-definition/metadata/party/address/postal-code" -->
@@ -2605,16 +2649,17 @@
          <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='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:[@key='postal-code']"
+   <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>
+      <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:[@key='country']"
+   <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="component-definition/metadata/party/address/country" -->
@@ -2634,16 +2679,17 @@
          <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='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:[@key='country']"
+   <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>
+      <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:"
+   <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="component-definition/metadata/party/member-of-organization" -->
@@ -2658,16 +2704,18 @@
              _in-xml-name="member-of-organization"
              _in-json-name="member-of-organizations"
              gi="member-of-organization"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='text']"
+   <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="component-definition/metadata/responsible-party/link/text" -->
@@ -2687,16 +2735,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-parties']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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="component-definition/component/title" -->
@@ -2716,16 +2765,17 @@
          <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='components']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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="component-definition/component/description" -->
@@ -2746,16 +2796,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='purpose']"
+   <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="component-definition/component/purpose" -->
@@ -2775,16 +2826,17 @@
          <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='component-definition']/j:array[@key='components']/j:map/j:[@key='purpose']"
+   <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>
+      <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:[@key='text']"
+   <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="component-definition/component/link/text" -->
@@ -2804,16 +2856,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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="component-definition/component/responsible-role/link/text" -->
@@ -2833,16 +2886,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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="component-definition/component/protocol/title" -->
@@ -2862,12 +2916,13 @@
          <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='components']/j:map/j:array[@key='protocols']/j:map/j:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -2878,7 +2933,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/defined-component/control-implementation"
                 _metaschema-json-id="/assembly/oscal-component-definition/defined-component/control-implementations"
                 name="control-implementation"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:control-implementation"
                 _step="control-implementation"
                 _key="control-implementations"
@@ -2896,7 +2951,7 @@
          <xsl:apply-templates select="*[@key='implemented-requirements']"/>
       </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:[@key='description']"
+   <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="component-definition/component/control-implementation/description" -->
@@ -2917,16 +2972,17 @@
          <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:array[@key='control-implementations']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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="component-definition/component/control-implementation/link/text" -->
@@ -2946,16 +3002,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <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:"
+   <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="component-definition/component/control-implementation/set-parameter/value" -->
@@ -2970,12 +3027,14 @@
              _in-xml-name="value"
              _in-json-name="values"
              gi="value"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -2986,7 +3045,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/control-implementation/implemented-requirement"
                 _metaschema-json-id="/assembly/oscal-component-definition/control-implementation/implemented-requirements"
                 name="implemented-requirement"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:implemented-requirement"
                 _step="implemented-requirement"
                 _key="implemented-requirements"
@@ -3006,7 +3065,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -3027,16 +3086,17 @@
          <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:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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="component-definition/component/control-implementation/implemented-requirement/link/text" -->
@@ -3056,16 +3116,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:"
+   <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="component-definition/component/control-implementation/implemented-requirement/set-parameter/value" -->
@@ -3080,16 +3141,18 @@
              _in-xml-name="value"
              _in-json-name="values"
              gi="value"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='text']"
+   <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="component-definition/component/control-implementation/implemented-requirement/responsible-role/link/text" -->
@@ -3109,12 +3172,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3125,7 +3189,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/implemented-requirement/statement"
                 _metaschema-json-id="/assembly/oscal-component-definition/implemented-requirement/statements"
                 name="statement"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:statement"
                 _step="statement"
                 _key="statements"
@@ -3143,7 +3207,7 @@
          <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:[@key='description']"
+   <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="component-definition/component/control-implementation/implemented-requirement/statement/description" -->
@@ -3164,16 +3228,17 @@
          <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:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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="component-definition/component/control-implementation/implemented-requirement/statement/link/text" -->
@@ -3193,16 +3258,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='statements']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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="component-definition/component/control-implementation/implemented-requirement/statement/responsible-role/link/text" -->
@@ -3222,16 +3288,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='statements']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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="component-definition/capability/description" -->
@@ -3252,16 +3319,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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="component-definition/capability/link/text" -->
@@ -3281,16 +3349,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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="component-definition/capability/incorporates-component/description" -->
@@ -3311,12 +3380,13 @@
          <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='incorporates-components']/j:map/j:[@key='description']"
+   <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>
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3327,7 +3397,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/capability/control-implementation"
                 _metaschema-json-id="/assembly/oscal-component-definition/capability/control-implementations"
                 name="control-implementation"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:control-implementation"
                 _step="control-implementation"
                 _key="control-implementations"
@@ -3345,7 +3415,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -3366,16 +3436,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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="component-definition/capability/control-implementation/link/text" -->
@@ -3395,16 +3466,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <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:"
+   <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="component-definition/capability/control-implementation/set-parameter/value" -->
@@ -3419,12 +3491,14 @@
              _in-xml-name="value"
              _in-json-name="values"
              gi="value"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3435,7 +3509,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/control-implementation/implemented-requirement"
                 _metaschema-json-id="/assembly/oscal-component-definition/control-implementation/implemented-requirements"
                 name="implemented-requirement"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:implemented-requirement"
                 _step="implemented-requirement"
                 _key="implemented-requirements"
@@ -3455,7 +3529,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -3476,16 +3550,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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="component-definition/capability/control-implementation/implemented-requirement/link/text" -->
@@ -3505,16 +3580,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:"
+   <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="component-definition/capability/control-implementation/implemented-requirement/set-parameter/value" -->
@@ -3529,16 +3605,18 @@
              _in-xml-name="value"
              _in-json-name="values"
              gi="value"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='text']"
+   <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="component-definition/capability/control-implementation/implemented-requirement/responsible-role/link/text" -->
@@ -3558,12 +3636,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3574,7 +3653,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-component-definition/implemented-requirement/statement"
                 _metaschema-json-id="/assembly/oscal-component-definition/implemented-requirement/statements"
                 name="statement"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_component_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_component_metaschema.xml"
                 _key-name="oscal-component-definition:statement"
                 _step="statement"
                 _key="statements"
@@ -3592,7 +3671,7 @@
          <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:[@key='description']"
+   <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="component-definition/capability/control-implementation/implemented-requirement/statement/description" -->
@@ -3613,16 +3692,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -3642,16 +3722,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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="component-definition/capability/control-implementation/implemented-requirement/statement/responsible-role/link/text" -->
@@ -3671,12 +3752,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3704,7 +3786,7 @@
          <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:[@key='title']"
+   <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="component-definition/back-matter/resource/title" -->
@@ -3724,16 +3806,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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="component-definition/back-matter/resource/description" -->
@@ -3754,12 +3837,13 @@
          <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='back-matter']/j:array[@key='resources']/j:map/j:[@key='description']"
+   <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>
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3772,7 +3856,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -3814,7 +3898,7 @@
          <xsl:apply-templates select="*[@key='links']"/>
       </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:[@key='text']"
+   <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="component-definition/back-matter/resource/citation/text" -->
@@ -3834,16 +3918,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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="component-definition/back-matter/resource/citation/link/text" -->
@@ -3863,12 +3948,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3958,11 +4044,11 @@
       <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"/>
diff --git a/xml/convert/oscal_poam_json-to-xml-converter.xsl b/xml/convert/oscal_poam_json-to-xml-converter.xsl
index b7b1c7dc21..ecef1edbf3 100644
--- a/xml/convert/oscal_poam_json-to-xml-converter.xsl
+++ b/xml/convert/oscal_poam_json-to-xml-converter.xsl
@@ -78,7 +78,7 @@
                 _metaschema-json-id="/assembly/oscal-poam/plan-of-action-and-milestones"
                 name="plan-of-action-and-milestones"
                 key="plan-of-action-and-milestones"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_poam_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_poam_metaschema.xml"
                 _key-name="oscal-poam:plan-of-action-and-milestones"
                 _using-root-name="plan-of-action-and-milestones"
                 gi="plan-of-action-and-milestones">
@@ -106,7 +106,7 @@
                 _metaschema-json-id="/assembly/oscal-poam/plan-of-action-and-milestones/metadata"
                 name="metadata"
                 key="metadata"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:metadata"
                 _step="metadata"
                 _key="metadata"
@@ -140,7 +140,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/revision/prop"
                 _metaschema-json-id="/assembly/oscal-metadata/revision/props"
                 name="property"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:property"
                 _step="prop"
                 _key="props"
@@ -163,7 +163,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/revision/link"
                 _metaschema-json-id="/assembly/oscal-metadata/revision/links"
                 name="link"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:link"
                 _step="link"
                 _key="links"
@@ -184,7 +184,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/role"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/roles"
                 name="role"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:role"
                 _step="role"
                 _key="roles"
@@ -208,7 +208,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/location"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/locations"
                 name="location"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:location"
                 _step="location"
                 _key="locations"
@@ -234,7 +234,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/party"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/parties"
                 name="party"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:party"
                 _step="party"
                 _key="parties"
@@ -264,7 +264,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/responsible-party"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/responsible-parties"
                 name="responsible-party"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:responsible-party"
                 _step="responsible-party"
                 _key="responsible-parties"
@@ -287,7 +287,7 @@
                 _metaschema-json-id="/assembly/oscal-poam/plan-of-action-and-milestones/import-ssp"
                 name="import-ssp"
                 key="import-ssp"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:import-ssp"
                 _step="import-ssp"
                 _key="import-ssp"
@@ -310,7 +310,7 @@
                 _metaschema-json-id="/assembly/oscal-poam/plan-of-action-and-milestones/local-definitions"
                 name="local-definitions"
                 key="local-definitions"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_poam_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_poam_metaschema.xml"
                 _key-name="oscal-poam:local-definitions"
                 _step="local-definitions"
                 _key="local-definitions"
@@ -333,7 +333,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-poam/local-definitions/component"
                 _metaschema-json-id="/assembly/oscal-poam/local-definitions/components"
                 name="system-component"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:system-component"
                 _step="component"
                 _key="components"
@@ -361,7 +361,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/responsible-role"
                 _metaschema-json-id="/assembly/oscal-implementation-common/system-component/responsible-roles"
                 name="responsible-role"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:responsible-role"
                 _step="responsible-role"
                 _key="responsible-roles"
@@ -383,7 +383,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/protocol"
                 _metaschema-json-id="/assembly/oscal-implementation-common/system-component/protocols"
                 name="protocol"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:protocol"
                 _step="protocol"
                 _key="protocols"
@@ -405,7 +405,7 @@
                 _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/port-range"
                 _metaschema-json-id="/assembly/oscal-implementation-common/protocol/port-ranges"
                 name="port-range"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:port-range"
                 _step="port-range"
                 _key="port-ranges"
@@ -425,7 +425,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-poam/local-definitions/inventory-item"
                 _metaschema-json-id="/assembly/oscal-poam/local-definitions/inventory-items"
                 name="inventory-item"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:inventory-item"
                 _step="inventory-item"
                 _key="inventory-items"
@@ -449,7 +449,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-poam/plan-of-action-and-milestones/observation"
                 _metaschema-json-id="/assembly/oscal-poam/plan-of-action-and-milestones/observations"
                 name="observation"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:observation"
                 _step="observation"
                 _key="observations"
@@ -479,7 +479,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/observation/origin"
                 _metaschema-json-id="/assembly/oscal-assessment-common/observation/origins"
                 name="origin"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:origin"
                 _step="origin"
                 _key="origins"
@@ -501,7 +501,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/origin/actor"
                 _metaschema-json-id="/assembly/oscal-assessment-common/origin/actors"
                 name="origin-actor"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:origin-actor"
                 _step="actor"
                 _key="actors"
@@ -523,7 +523,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/origin/related-task"
                 _metaschema-json-id="/assembly/oscal-assessment-common/origin/related-tasks"
                 name="related-task"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:related-task"
                 _step="related-task"
                 _key="related-tasks"
@@ -547,7 +547,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/related-task/subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/related-task/subjects"
                 name="assessment-subject"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:assessment-subject"
                 _step="subject"
                 _key="subjects"
@@ -572,7 +572,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/include-subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/include-subjects"
                 name="select-subject-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-subject-by-id"
                 _step="include-subject"
                 _key="include-subjects"
@@ -594,7 +594,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-subject/exclude-subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/assessment-subject/exclude-subjects"
                 name="select-subject-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:select-subject-by-id"
                 _step="exclude-subject"
                 _key="exclude-subjects"
@@ -616,7 +616,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-poam/plan-of-action-and-milestones/risk"
                 _metaschema-json-id="/assembly/oscal-poam/plan-of-action-and-milestones/risks"
                 name="risk"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:risk"
                 _step="risk"
                 _key="risks"
@@ -648,7 +648,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/risk/characterization"
                 _metaschema-json-id="/assembly/oscal-assessment-common/risk/characterizations"
                 name="characterization"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:characterization"
                 _step="characterization"
                 _key="characterizations"
@@ -669,7 +669,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/response/task"
                 _metaschema-json-id="/assembly/oscal-assessment-common/response/tasks"
                 name="task"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:task"
                 _step="task"
                 _key="tasks"
@@ -700,7 +700,7 @@
                 _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/logged-by"
                 _metaschema-json-id="/assembly/oscal-assessment-common/risk/risk-log/entries/logged-by"
                 name="logged-by"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:logged-by"
                 _step="logged-by"
                 _key="logged-by"
@@ -719,7 +719,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-poam/plan-of-action-and-milestones/poam-item"
                 _metaschema-json-id="/assembly/oscal-poam/plan-of-action-and-milestones/poam-items"
                 name="poam-item"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_poam_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_poam_metaschema.xml"
                 _key-name="oscal-poam:poam-item"
                 _step="poam-item"
                 _key="poam-items"
@@ -746,7 +746,7 @@
                 _metaschema-json-id="/assembly/oscal-poam/plan-of-action-and-milestones/back-matter"
                 name="back-matter"
                 key="back-matter"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:back-matter"
                 _step="back-matter"
                 _key="back-matter"
@@ -761,7 +761,7 @@
          <xsl:apply-templates select="*[@key='resources']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:[@key='remarks']">
+   <xsl:template match="j:string[@key='remarks']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="remarks" -->
       <field _metaschema-xml-id="/assembly/oscal-metadata/property/remarks"
@@ -771,7 +771,7 @@
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:remarks"
              _step="remarks"
              _key="remarks"
@@ -784,14 +784,17 @@
          <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:[@key='remarks']" mode="get-value-property" priority="8">
-      <value>
+   <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:">
+   <xsl:template match="j:array[@key='location-uuids']/j:string">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="location-uuid" -->
       <field _metaschema-xml-id="/assembly/oscal-metadata/party/location-uuid"
@@ -799,7 +802,7 @@
              collapsible="no"
              as-type="uuid"
              name="location-uuid"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:location-uuid"
              _step="location-uuid"
              _key="location-uuids"
@@ -808,16 +811,18 @@
              _in-xml-name="location-uuid"
              _in-json-name="location-uuids"
              gi="location-uuid"
-             in-json="SCALAR"/>
+             in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="j:array[@key='location-uuids']/j:"
+   <xsl:template match="j:array[@key='location-uuids']/j:string"
                  mode="get-value-property"
                  priority="8">
-      <value>
+      <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="(j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:string[@key='party-uuid'] | j:array[@key='party-uuids']/j:)">
+   <xsl:template match="(j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:string[@key='party-uuid'] | j:array[@key='party-uuids']/j:string)">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="party-uuid" -->
       <field _metaschema-xml-id="/assembly/oscal-metadata/responsible-party/party-uuid"
@@ -825,7 +830,7 @@
              collapsible="no"
              as-type="uuid"
              name="party-uuid"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:party-uuid"
              _step="party-uuid"
              _key="party-uuids"
@@ -834,12 +839,14 @@
              _in-xml-name="party-uuid"
              _in-json-name="party-uuids"
              gi="party-uuid"
-             in-json="SCALAR"/>
+             in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="(j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:string[@key='party-uuid'] | j:array[@key='party-uuids']/j:)"
+   <xsl:template match="(j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:string[@key='party-uuid'] | j:array[@key='party-uuids']/j:string)"
                  mode="get-value-property"
                  priority="7">
-      <value>
+      <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -852,7 +859,7 @@
              as-type="string"
              name="system-id"
              key="system-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
              _key-name="oscal-implementation-common:system-id"
              _step="system-id"
              _key="system-id"
@@ -882,7 +889,7 @@
              collapsible="no"
              as-type="uri"
              name="threat-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
              _key-name="oscal-assessment-common:threat-id"
              _step="threat-id"
              _key="threat-ids"
@@ -902,7 +909,7 @@
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
-   <xsl:template match="j:[@key='status-change']">
+   <xsl:template match="j:string[@key='status-change']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="status-change" -->
       <field _metaschema-xml-id="/assembly/oscal-assessment-common/risk/risk-log/entry/status-change"
@@ -911,7 +918,7 @@
              as-type="token"
              name="risk-status"
              key="status-change"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
              _key-name="oscal-assessment-common:risk-status"
              _step="status-change"
              _key="status-change"
@@ -924,12 +931,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status-change</xsl:attribute>
          </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:[@key='status-change']"
+   <xsl:template match="j:string[@key='status-change']"
                  mode="get-value-property"
                  priority="8">
-      <value>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -941,7 +949,7 @@
              collapsible="no"
              as-type="string"
              name="hash"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:hash"
              _step="hash"
              _key="hashes"
@@ -1119,7 +1127,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/link/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -1199,7 +1207,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/address/type"
             name="location-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:location-type"
             _step="type"
             _key="type"
@@ -1375,7 +1383,7 @@
             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/type"
             name="system-component-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
             _key-name="oscal-implementation-common:system-component-type"
             _step="type"
             _key="type"
@@ -1684,7 +1692,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/select-subject-by-id/subject-uuid"
             name="subject-uuid"
             key="subject-uuid"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
             _key-name="oscal-assessment-common:subject-uuid"
             _step="subject-uuid"
             _key="subject-uuid"
@@ -1706,7 +1714,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/select-subject-by-id/type"
             name="subject-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
             _key-name="oscal-assessment-common:subject-type"
             _step="type"
             _key="type"
@@ -1748,7 +1756,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/subject-reference/subject-uuid"
             name="subject-uuid"
             key="subject-uuid"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
             _key-name="oscal-assessment-common:subject-uuid"
             _step="subject-uuid"
             _key="subject-uuid"
@@ -1770,7 +1778,7 @@
             _metaschema-json-id="/assembly/oscal-assessment-common/subject-reference/type"
             name="subject-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
             _key-name="oscal-assessment-common:subject-type"
             _step="type"
             _key="type"
@@ -2404,7 +2412,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -2465,7 +2473,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -2480,7 +2488,7 @@
    <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>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:[@key='title']"
+   <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="plan-of-action-and-milestones/metadata/title" -->
@@ -2500,16 +2508,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='published']"
+   <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="plan-of-action-and-milestones/metadata/published" -->
@@ -2519,7 +2528,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -2532,16 +2541,17 @@
          <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='plan-of-action-and-milestones']/j:map[@key='metadata']/j:[@key='published']"
+   <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>
+      <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:[@key='last-modified']"
+   <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="plan-of-action-and-milestones/metadata/last-modified" -->
@@ -2551,7 +2561,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -2564,16 +2574,17 @@
          <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='plan-of-action-and-milestones']/j:map[@key='metadata']/j:[@key='last-modified']"
+   <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>
+      <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:[@key='version']"
+   <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="plan-of-action-and-milestones/metadata/version" -->
@@ -2583,7 +2594,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -2596,16 +2607,17 @@
          <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='plan-of-action-and-milestones']/j:map[@key='metadata']/j:[@key='version']"
+   <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>
+      <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:[@key='oscal-version']"
+   <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="plan-of-action-and-milestones/metadata/oscal-version" -->
@@ -2615,7 +2627,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -2628,12 +2640,13 @@
          <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='plan-of-action-and-milestones']/j:map[@key='metadata']/j:[@key='oscal-version']"
+   <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>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -2644,7 +2657,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/revisions/revision"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/revisions"
                 name="revision"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:revision"
                 _step="revisions/revision"
                 _key="revisions"
@@ -2672,7 +2685,7 @@
              group-json="ARRAY"
              name="revision"
              key="revisions"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:revision"
              _key-ref="oscal-metadata:revision">
          <xsl:if test="$with-key">
@@ -2681,7 +2694,7 @@
          <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:[@key='title']"
+   <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" -->
@@ -2701,16 +2714,17 @@
          <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='revisions']/j:array[@key='revisions']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='published']"
+   <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="plan-of-action-and-milestones/metadata/revisions/revision/published" -->
@@ -2720,7 +2734,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -2733,16 +2747,17 @@
          <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='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='published']"
+   <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>
+      <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:[@key='last-modified']"
+   <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="plan-of-action-and-milestones/metadata/revisions/revision/last-modified" -->
@@ -2752,7 +2767,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -2765,16 +2780,17 @@
          <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='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='last-modified']"
+   <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>
+      <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:[@key='version']"
+   <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="plan-of-action-and-milestones/metadata/revisions/revision/version" -->
@@ -2784,7 +2800,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -2797,16 +2813,17 @@
          <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='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='version']"
+   <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>
+      <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:[@key='oscal-version']"
+   <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="plan-of-action-and-milestones/metadata/revisions/revision/oscal-version" -->
@@ -2816,7 +2833,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -2829,16 +2846,17 @@
          <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='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='oscal-version']"
+   <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>
+      <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:[@key='text']"
+   <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="plan-of-action-and-milestones/metadata/revisions/revision/link/text" -->
@@ -2858,12 +2876,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -2876,7 +2895,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -2896,7 +2915,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -2916,16 +2935,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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" -->
@@ -2945,16 +2965,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='short-name']"
+   <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="plan-of-action-and-milestones/metadata/role/short-name" -->
@@ -2974,16 +2995,17 @@
          <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='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:[@key='short-name']"
+   <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>
+      <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:[@key='description']"
+   <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="plan-of-action-and-milestones/metadata/role/description" -->
@@ -3004,16 +3026,17 @@
          <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='metadata']/j:array[@key='roles']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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="plan-of-action-and-milestones/metadata/role/link/text" -->
@@ -3033,16 +3056,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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" -->
@@ -3062,12 +3086,13 @@
          <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:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3079,7 +3104,7 @@
                 _metaschema-json-id="/assembly/oscal-metadata/location/address"
                 name="address"
                 key="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="address"
@@ -3099,7 +3124,7 @@
          <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:"
+   <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" -->
@@ -3108,7 +3133,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -3117,16 +3142,18 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='city']"
+   <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="plan-of-action-and-milestones/metadata/location/address/city" -->
@@ -3146,16 +3173,17 @@
          <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='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:[@key='city']"
+   <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>
+      <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:[@key='state']"
+   <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="plan-of-action-and-milestones/metadata/location/address/state" -->
@@ -3175,16 +3203,17 @@
          <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='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:[@key='state']"
+   <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>
+      <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:[@key='postal-code']"
+   <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="plan-of-action-and-milestones/metadata/location/address/postal-code" -->
@@ -3204,16 +3233,17 @@
          <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='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:[@key='postal-code']"
+   <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>
+      <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:[@key='country']"
+   <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="plan-of-action-and-milestones/metadata/location/address/country" -->
@@ -3233,16 +3263,17 @@
          <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='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:[@key='country']"
+   <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>
+      <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:"
+   <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="plan-of-action-and-milestones/metadata/location/email-address" -->
@@ -3251,7 +3282,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -3260,12 +3291,14 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3278,7 +3311,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -3298,7 +3331,7 @@
          <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:"
+   <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="plan-of-action-and-milestones/metadata/location/url" -->
@@ -3313,16 +3346,18 @@
              _in-xml-name="url"
              _in-json-name="urls"
              gi="url"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='text']"
+   <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="plan-of-action-and-milestones/metadata/location/link/text" -->
@@ -3342,16 +3377,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='name']"
+   <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="plan-of-action-and-milestones/metadata/party/name" -->
@@ -3371,16 +3407,17 @@
          <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='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:[@key='name']"
+   <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>
+      <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:[@key='short-name']"
+   <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="plan-of-action-and-milestones/metadata/party/short-name" -->
@@ -3400,12 +3437,13 @@
          <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='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:[@key='short-name']"
+   <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>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3435,7 +3473,7 @@
          <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:[@key='text']"
+   <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="plan-of-action-and-milestones/metadata/party/link/text" -->
@@ -3455,16 +3493,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <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:"
+   <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="plan-of-action-and-milestones/metadata/party/email-address" -->
@@ -3473,7 +3512,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -3482,12 +3521,14 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3500,7 +3541,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -3527,7 +3568,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/party/address"
                 _metaschema-json-id="/assembly/oscal-metadata/party/addresses"
                 name="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="addresses"
@@ -3544,7 +3585,7 @@
          <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:"
+   <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="plan-of-action-and-milestones/metadata/party/address/addr-line" -->
@@ -3553,7 +3594,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -3562,16 +3603,18 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='city']"
+   <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/party/address/city" -->
@@ -3591,16 +3634,17 @@
          <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='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:[@key='city']"
+   <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>
+      <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:[@key='state']"
+   <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/party/address/state" -->
@@ -3620,16 +3664,17 @@
          <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='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:[@key='state']"
+   <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>
+      <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:[@key='postal-code']"
+   <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/party/address/postal-code" -->
@@ -3649,16 +3694,17 @@
          <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='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:[@key='postal-code']"
+   <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>
+      <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:[@key='country']"
+   <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/party/address/country" -->
@@ -3678,16 +3724,17 @@
          <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='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:[@key='country']"
+   <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>
+      <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:"
+   <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" -->
@@ -3702,16 +3749,18 @@
              _in-xml-name="member-of-organization"
              _in-json-name="member-of-organizations"
              gi="member-of-organization"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='text']"
+   <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/responsible-party/link/text" -->
@@ -3731,16 +3780,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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/local-definitions/component/title" -->
@@ -3760,16 +3810,17 @@
          <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:array[@key='components']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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/local-definitions/component/description" -->
@@ -3790,16 +3841,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='purpose']"
+   <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/local-definitions/component/purpose" -->
@@ -3819,16 +3871,17 @@
          <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:array[@key='components']/j:map/j:[@key='purpose']"
+   <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>
+      <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:[@key='text']"
+   <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/local-definitions/component/link/text" -->
@@ -3848,12 +3901,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3878,7 +3932,7 @@
          <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:[@key='text']"
+   <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/local-definitions/component/responsible-role/link/text" -->
@@ -3898,16 +3952,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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/local-definitions/component/protocol/title" -->
@@ -3927,16 +3982,17 @@
          <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:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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/local-definitions/inventory-item/description" -->
@@ -3957,16 +4013,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/local-definitions/inventory-item/link/text" -->
@@ -3986,16 +4043,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/local-definitions/inventory-item/responsible-party/link/text" -->
@@ -4015,12 +4073,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-parties']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -4044,7 +4103,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -4064,16 +4123,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='implemented-components']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/local-definitions/inventory-item/implemented-component/responsible-party/link/text" -->
@@ -4093,16 +4153,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='implemented-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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/observation/title" -->
@@ -4122,16 +4183,17 @@
          <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='observations']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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/observation/description" -->
@@ -4152,16 +4214,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/observation/link/text" -->
@@ -4181,16 +4244,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:"
+   <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" -->
@@ -4205,16 +4269,18 @@
              _in-xml-name="method"
              _in-json-name="methods"
              gi="method"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:"
+   <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" -->
@@ -4229,16 +4295,18 @@
              _in-xml-name="type"
              _in-json-name="types"
              gi="type"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='text']"
+   <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/observation/origin/actor/link/text" -->
@@ -4258,16 +4326,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/observation/origin/related-task/link/text" -->
@@ -4287,16 +4356,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/observation/origin/related-task/responsible-party/link/text" -->
@@ -4316,16 +4386,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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/observation/origin/related-task/subject/description" -->
@@ -4346,16 +4417,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/observation/origin/related-task/subject/link/text" -->
@@ -4375,12 +4447,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -4404,7 +4477,7 @@
          </xsl:if>
       </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:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/observation/origin/related-task/subject/include-subject/link/text" -->
@@ -4424,16 +4497,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/observation/origin/related-task/subject/exclude-subject/link/text" -->
@@ -4453,12 +4527,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -4483,7 +4558,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -4504,16 +4579,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/observation/origin/related-task/identified-subject/subject/link/text" -->
@@ -4533,12 +4609,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -4562,7 +4639,7 @@
          </xsl:if>
       </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:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/observation/origin/related-task/identified-subject/subject/include-subject/link/text" -->
@@ -4582,16 +4659,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/observation/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
@@ -4611,12 +4689,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -4627,7 +4706,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/observation/subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/observation/subjects"
                 name="subject-reference"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:subject-reference"
                 _step="subject"
                 _key="subjects"
@@ -4644,7 +4723,7 @@
          <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:[@key='title']"
+   <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/observation/subject/title" -->
@@ -4664,16 +4743,17 @@
          <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='observations']/j:map/j:array[@key='subjects']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='text']"
+   <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/observation/subject/link/text" -->
@@ -4693,12 +4773,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -4722,7 +4803,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -4743,16 +4824,17 @@
          <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='relevant-evidence']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/observation/relevant-evidence/link/text" -->
@@ -4772,16 +4854,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='collected']"
+   <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/observation/collected" -->
@@ -4801,16 +4884,17 @@
          <xsl:if test="$with-key">
             <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:array[@key='observations']/j:map/j:[@key='collected']"
+   <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>
+      <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:[@key='expires']"
+   <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/observation/expires" -->
@@ -4830,16 +4914,17 @@
          <xsl:if test="$with-key">
             <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:array[@key='observations']/j:map/j:[@key='expires']"
+   <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>
+      <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:[@key='title']"
+   <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/risk/title" -->
@@ -4859,16 +4944,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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/risk/description" -->
@@ -4889,16 +4975,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='statement']"
+   <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/risk/statement" -->
@@ -4919,16 +5006,17 @@
          <xsl:if test="$with-key">
             <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='risks']/j:map/j:[@key='statement']"
+   <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>
+      <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:[@key='text']"
+   <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/risk/link/text" -->
@@ -4948,16 +5036,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='status']"
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:string[@key='status']"
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/status" -->
@@ -4977,16 +5066,17 @@
          <xsl:if test="$with-key">
             <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:[@key='status']"
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:string[@key='status']"
                  mode="get-value-property"
                  priority="5">
-      <value>
+      <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='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/risk/origin/actor/link/text" -->
@@ -5006,16 +5096,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/risk/origin/related-task/link/text" -->
@@ -5035,16 +5126,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/risk/origin/related-task/responsible-party/link/text" -->
@@ -5064,16 +5156,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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/risk/origin/related-task/subject/description" -->
@@ -5094,16 +5187,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/risk/origin/related-task/subject/link/text" -->
@@ -5123,12 +5217,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -5152,7 +5247,7 @@
          </xsl:if>
       </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:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/risk/origin/related-task/subject/include-subject/link/text" -->
@@ -5172,16 +5267,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/risk/origin/related-task/subject/exclude-subject/link/text" -->
@@ -5201,12 +5297,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -5231,7 +5328,7 @@
          <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:[@key='description']"
+   <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/risk/origin/related-task/identified-subject/subject/description" -->
@@ -5252,16 +5349,17 @@
          <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:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/risk/origin/related-task/identified-subject/subject/link/text" -->
@@ -5281,12 +5379,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -5310,7 +5409,7 @@
          </xsl:if>
       </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:[@key='text']"
+   <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/risk/origin/related-task/identified-subject/subject/include-subject/link/text" -->
@@ -5330,16 +5429,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/risk/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
@@ -5359,16 +5459,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/risk/characterization/link/text" -->
@@ -5388,16 +5489,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/risk/characterization/origin/actor/link/text" -->
@@ -5417,16 +5519,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/risk/characterization/origin/related-task/link/text" -->
@@ -5446,16 +5549,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/risk/characterization/origin/related-task/responsible-party/link/text" -->
@@ -5475,16 +5579,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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/risk/characterization/origin/related-task/subject/description" -->
@@ -5505,16 +5610,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/risk/characterization/origin/related-task/subject/link/text" -->
@@ -5534,12 +5640,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -5563,7 +5670,7 @@
          </xsl:if>
       </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:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/characterization/origin/related-task/subject/include-subject/link/text" -->
@@ -5583,16 +5690,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/characterization/origin/related-task/subject/exclude-subject/link/text" -->
@@ -5612,12 +5720,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -5642,7 +5751,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -5663,16 +5772,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/characterization/origin/related-task/identified-subject/subject/link/text" -->
@@ -5692,12 +5802,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -5721,7 +5832,7 @@
          </xsl:if>
       </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:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/characterization/origin/related-task/identified-subject/subject/include-subject/link/text" -->
@@ -5741,16 +5852,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/characterization/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
@@ -5770,12 +5882,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -5800,7 +5913,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -5820,12 +5933,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -5850,7 +5964,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -5871,16 +5985,17 @@
          <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='mitigating-factors']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/mitigating-factor/link/text" -->
@@ -5900,12 +6015,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -5916,7 +6032,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/risk/mitigating-factor/subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/risk/mitigating-factors/subjects"
                 name="subject-reference"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:subject-reference"
                 _step="subject"
                 _key="subjects"
@@ -5933,7 +6049,7 @@
          <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:[@key='title']"
+   <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" -->
@@ -5953,16 +6069,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='text']"
+   <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/mitigating-factor/subject/link/text" -->
@@ -5982,16 +6099,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='deadline']"
+   <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/deadline" -->
@@ -6011,12 +6129,13 @@
          <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='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:[@key='deadline']"
+   <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>
+      <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -6027,7 +6146,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/risk/response"
                 _metaschema-json-id="/assembly/oscal-assessment-common/risk/remediations"
                 name="response"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:response"
                 _step="response"
                 _key="remediations"
@@ -6048,7 +6167,7 @@
          <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:[@key='title']"
+   <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/response/title" -->
@@ -6068,16 +6187,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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/response/description" -->
@@ -6098,16 +6218,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/response/link/text" -->
@@ -6127,16 +6248,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/response/origin/actor/link/text" -->
@@ -6156,16 +6278,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='actors']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/response/origin/related-task/link/text" -->
@@ -6185,16 +6308,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/response/origin/related-task/responsible-party/link/text" -->
@@ -6214,16 +6338,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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/response/origin/related-task/subject/description" -->
@@ -6244,16 +6369,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/response/origin/related-task/subject/link/text" -->
@@ -6273,12 +6399,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -6302,7 +6429,7 @@
          </xsl:if>
       </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='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/response/origin/related-task/subject/include-subject/link/text" -->
@@ -6322,16 +6449,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/response/origin/related-task/subject/exclude-subject/link/text" -->
@@ -6351,12 +6479,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -6381,7 +6510,7 @@
          <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:[@key='description']"
+   <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/response/origin/related-task/identified-subject/subject/description" -->
@@ -6402,16 +6531,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/response/origin/related-task/identified-subject/subject/link/text" -->
@@ -6431,12 +6561,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -6460,7 +6591,7 @@
          </xsl:if>
       </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:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/response/origin/related-task/identified-subject/subject/include-subject/link/text" -->
@@ -6480,16 +6611,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/response/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
@@ -6509,12 +6641,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -6547,7 +6680,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-assessment-common/response/required-asset/subject"
                 _metaschema-json-id="/assembly/oscal-assessment-common/response/required-assets/subjects"
                 name="subject-reference"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_assessment-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_assessment-common_metaschema.xml"
                 _key-name="oscal-assessment-common:subject-reference"
                 _step="subject"
                 _key="subjects"
@@ -6564,7 +6697,7 @@
          <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:[@key='title']"
+   <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/response/required-asset/subject/title" -->
@@ -6584,16 +6717,17 @@
          <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:array[@key='subjects']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='text']"
+   <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/response/required-asset/subject/link/text" -->
@@ -6613,16 +6747,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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/response/required-asset/title" -->
@@ -6642,16 +6777,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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/response/required-asset/description" -->
@@ -6672,16 +6808,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/response/required-asset/link/text" -->
@@ -6701,16 +6838,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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//task/title" -->
@@ -6730,16 +6868,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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" -->
@@ -6760,16 +6899,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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//task/link/text" -->
@@ -6789,12 +6929,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -6923,7 +7064,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -6943,16 +7084,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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//task/associated-activity/responsible-role/link/text" -->
@@ -6972,16 +7114,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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//task/associated-activity/subject/description" -->
@@ -7002,16 +7145,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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//task/associated-activity/subject/link/text" -->
@@ -7031,12 +7175,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -7060,7 +7205,7 @@
          </xsl:if>
       </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='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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//task/associated-activity/subject/include-subject/link/text" -->
@@ -7080,16 +7225,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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//task/associated-activity/subject/exclude-subject/link/text" -->
@@ -7109,16 +7255,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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//task/subject/description" -->
@@ -7139,16 +7286,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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//task/subject/link/text" -->
@@ -7168,12 +7316,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -7197,7 +7346,7 @@
          </xsl:if>
       </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='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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//task/subject/include-subject/link/text" -->
@@ -7217,16 +7366,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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//task/subject/exclude-subject/link/text" -->
@@ -7246,16 +7396,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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//task/responsible-role/link/text" -->
@@ -7275,12 +7426,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -7330,7 +7482,7 @@
          <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:[@key='title']"
+   <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/risk-log/entry/title" -->
@@ -7350,16 +7502,17 @@
          <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:map[@key='risk-log']/j:array[@key='entries']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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/risk-log/entry/description" -->
@@ -7380,16 +7533,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='start']"
+   <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/risk-log/entry/start" -->
@@ -7409,16 +7563,17 @@
          <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='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:[@key='start']"
+   <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>
+      <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:[@key='end']"
+   <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/risk-log/entry/end" -->
@@ -7438,16 +7593,17 @@
          <xsl:if test="$with-key">
             <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:map[@key='risk-log']/j:array[@key='entries']/j:map/j:[@key='end']"
+   <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>
+      <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:[@key='text']"
+   <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/risk-log/entry/link/text" -->
@@ -7467,12 +7623,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -7496,7 +7653,7 @@
          <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:[@key='text']"
+   <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/risk-log/entry/related-response/link/text" -->
@@ -7516,16 +7673,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/risk-log/entry/related-response/related-task/link/text" -->
@@ -7545,16 +7703,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/risk-log/entry/related-response/related-task/responsible-party/link/text" -->
@@ -7574,16 +7733,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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/risk-log/entry/related-response/related-task/subject/description" -->
@@ -7604,16 +7764,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/risk-log/entry/related-response/related-task/subject/link/text" -->
@@ -7633,12 +7794,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -7662,7 +7824,7 @@
          </xsl:if>
       </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:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/risk-log/entry/related-response/related-task/subject/include-subject/link/text" -->
@@ -7682,16 +7844,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/risk-log/entry/related-response/related-task/subject/exclude-subject/link/text" -->
@@ -7711,12 +7874,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -7741,7 +7905,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -7762,16 +7926,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/risk-log/entry/related-response/related-task/identified-subject/subject/link/text" -->
@@ -7791,12 +7956,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -7820,7 +7986,7 @@
          </xsl:if>
       </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='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/risk-log/entry/related-response/related-task/identified-subject/subject/include-subject/link/text" -->
@@ -7840,16 +8006,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='include-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/risk-log/entry/related-response/related-task/identified-subject/subject/exclude-subject/link/text" -->
@@ -7869,12 +8036,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -7895,7 +8063,7 @@
          <xsl:apply-templates select="*[@key='observation-uuid']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:[@key='title']"
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:string[@key='title']"
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/poam-item/title" -->
@@ -7915,16 +8083,17 @@
          <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='poam-items']/j:map/j:[@key='title']"
+   <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">
-      <value>
+      <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:[@key='description']"
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:string[@key='description']"
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/poam-item/description" -->
@@ -7945,16 +8114,17 @@
          <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='poam-items']/j:map/j:[@key='description']"
+   <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">
-      <value>
+      <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:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/poam-item/link/text" -->
@@ -7974,12 +8144,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='poam-items']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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">
-      <value>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -7999,7 +8170,7 @@
          <xsl:apply-templates select="*[@key='actors']"/>
       </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:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/poam-item/origin/actor/link/text" -->
@@ -8019,12 +8190,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='poam-items']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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">
-      <value>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -8086,7 +8258,7 @@
          <xsl:apply-templates select="*[@key='remarks']"/>
       </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:[@key='title']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource/title" -->
@@ -8106,16 +8278,17 @@
          <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='back-matter']/j:array[@key='resources']/j:map/j:[@key='title']"
+   <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">
-      <value>
+      <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:[@key='description']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource/description" -->
@@ -8136,12 +8309,13 @@
          <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='back-matter']/j:array[@key='resources']/j:map/j:[@key='description']"
+   <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">
-      <value>
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -8154,7 +8328,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -8196,7 +8370,7 @@
          <xsl:apply-templates select="*[@key='links']"/>
       </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:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource/citation/text" -->
@@ -8216,16 +8390,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:[@key='text']"
+   <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">
-      <value>
+      <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:[@key='text']"
+   <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">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource/citation/link/text" -->
@@ -8245,12 +8420,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:[@key='text']"
+   <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">
-      <value>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -8340,11 +8516,11 @@
       <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"/>
diff --git a/xml/convert/oscal_profile_json-to-xml-converter.xsl b/xml/convert/oscal_profile_json-to-xml-converter.xsl
index 673b334bfe..4f1854e2b1 100644
--- a/xml/convert/oscal_profile_json-to-xml-converter.xsl
+++ b/xml/convert/oscal_profile_json-to-xml-converter.xsl
@@ -78,7 +78,7 @@
                 _metaschema-json-id="/assembly/oscal-profile/profile"
                 name="profile"
                 key="profile"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:profile"
                 _using-root-name="profile"
                 gi="profile">
@@ -103,7 +103,7 @@
                 _metaschema-json-id="/assembly/oscal-profile/profile/metadata"
                 name="metadata"
                 key="metadata"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:metadata"
                 _step="metadata"
                 _key="metadata"
@@ -137,7 +137,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/revision/prop"
                 _metaschema-json-id="/assembly/oscal-metadata/revision/props"
                 name="property"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:property"
                 _step="prop"
                 _key="props"
@@ -160,7 +160,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/revision/link"
                 _metaschema-json-id="/assembly/oscal-metadata/revision/links"
                 name="link"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:link"
                 _step="link"
                 _key="links"
@@ -181,7 +181,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/role"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/roles"
                 name="role"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:role"
                 _step="role"
                 _key="roles"
@@ -205,7 +205,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/location"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/locations"
                 name="location"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:location"
                 _step="location"
                 _key="locations"
@@ -231,7 +231,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/party"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/parties"
                 name="party"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:party"
                 _step="party"
                 _key="parties"
@@ -261,7 +261,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/responsible-party"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/responsible-parties"
                 name="responsible-party"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:responsible-party"
                 _step="responsible-party"
                 _key="responsible-parties"
@@ -283,7 +283,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/profile/import"
                 _metaschema-json-id="/assembly/oscal-profile/profile/imports"
                 name="import"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:import"
                 _step="import"
                 _key="imports"
@@ -306,7 +306,7 @@
                 _metaschema-json-id="/assembly/oscal-profile/import/include-all"
                 name="include-all"
                 key="include-all"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:include-all"
                 _step="include-all"
                 _key="include-all"
@@ -327,7 +327,7 @@
                 _metaschema-json-id="/assembly/oscal-profile/profile/merge"
                 name="merge"
                 key="merge"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:merge"
                 _step="merge"
                 _key="merge"
@@ -352,7 +352,7 @@
                 _metaschema-json-id="/assembly/oscal-profile/merge/combine"
                 name="combine"
                 key="combine"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:combine"
                 _step="combine"
                 _key="combine"
@@ -374,7 +374,7 @@
                 _metaschema-json-id="/assembly/oscal-profile/merge/custom"
                 name="custom"
                 key="custom"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:custom"
                 _step="custom"
                 _key="custom"
@@ -396,7 +396,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/custom/group"
                 _metaschema-json-id="/assembly/oscal-profile/custom/groups"
                 name="group"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:group"
                 _step="group"
                 _key="groups"
@@ -422,7 +422,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/group/param"
                 _metaschema-json-id="/assembly/oscal-profile/group/params"
                 name="parameter"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
                 _key-name="oscal-catalog-common:parameter"
                 _step="param"
                 _key="params"
@@ -451,7 +451,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/constraint"
                 _metaschema-json-id="/assembly/oscal-catalog-common/parameter/constraints"
                 name="parameter-constraint"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
                 _key-name="oscal-catalog-common:parameter-constraint"
                 _step="constraint"
                 _key="constraints"
@@ -470,7 +470,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/guideline"
                 _metaschema-json-id="/assembly/oscal-catalog-common/parameter/guidelines"
                 name="parameter-guideline"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
                 _key-name="oscal-catalog-common:parameter-guideline"
                 _step="guideline"
                 _key="guidelines"
@@ -489,7 +489,7 @@
                 _metaschema-json-id="/assembly/oscal-catalog-common/parameter/select"
                 name="parameter-selection"
                 key="select"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
                 _key-name="oscal-catalog-common:parameter-selection"
                 _step="select"
                 _key="select"
@@ -511,7 +511,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/group/part"
                 _metaschema-json-id="/assembly/oscal-profile/group/parts"
                 name="part"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
                 _key-name="oscal-catalog-common:part"
                 _step="part"
                 _key="parts"
@@ -537,7 +537,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/group/insert-controls"
                 _metaschema-json-id="/assembly/oscal-profile/group/insert-controls"
                 name="insert-controls"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:insert-controls"
                 _step="insert-controls"
                 _key="insert-controls"
@@ -559,7 +559,7 @@
                 _metaschema-json-id="/assembly/oscal-profile/profile/modify"
                 name="modify"
                 key="modify"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:modify"
                 _step="modify"
                 _key="modify"
@@ -581,7 +581,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/modify/alter"
                 _metaschema-json-id="/assembly/oscal-profile/modify/alters"
                 name="alter"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:alter"
                 _step="alter"
                 _key="alters"
@@ -602,7 +602,7 @@
                 _metaschema-xml-id="/assembly/oscal-profile/alter/remove"
                 _metaschema-json-id="/assembly/oscal-profile/alter/removes"
                 name="remove"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:remove"
                 _step="remove"
                 _key="removes"
@@ -624,7 +624,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/alter/add"
                 _metaschema-json-id="/assembly/oscal-profile/alter/adds"
                 name="add"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:add"
                 _step="add"
                 _key="adds"
@@ -649,7 +649,7 @@
                 _metaschema-json-id="/assembly/oscal-profile/profile/back-matter"
                 name="back-matter"
                 key="back-matter"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:back-matter"
                 _step="back-matter"
                 _key="back-matter"
@@ -664,7 +664,7 @@
          <xsl:apply-templates select="*[@key='resources']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:[@key='remarks']">
+   <xsl:template match="j:string[@key='remarks']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="remarks" -->
       <field _metaschema-xml-id="/assembly/oscal-metadata/property/remarks"
@@ -674,7 +674,7 @@
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:remarks"
              _step="remarks"
              _key="remarks"
@@ -687,14 +687,17 @@
          <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:[@key='remarks']" mode="get-value-property" priority="8">
-      <value>
+   <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:">
+   <xsl:template match="j:array[@key='location-uuids']/j:string">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="location-uuid" -->
       <field _metaschema-xml-id="/assembly/oscal-metadata/party/location-uuid"
@@ -702,7 +705,7 @@
              collapsible="no"
              as-type="uuid"
              name="location-uuid"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:location-uuid"
              _step="location-uuid"
              _key="location-uuids"
@@ -711,16 +714,18 @@
              _in-xml-name="location-uuid"
              _in-json-name="location-uuids"
              gi="location-uuid"
-             in-json="SCALAR"/>
+             in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="j:array[@key='location-uuids']/j:"
+   <xsl:template match="j:array[@key='location-uuids']/j:string"
                  mode="get-value-property"
                  priority="8">
-      <value>
+      <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:array[@key='party-uuids']/j:">
+   <xsl:template match="j:array[@key='party-uuids']/j:string">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="party-uuid" -->
       <field _metaschema-xml-id="/assembly/oscal-metadata/responsible-party/party-uuid"
@@ -728,7 +733,7 @@
              collapsible="no"
              as-type="uuid"
              name="party-uuid"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:party-uuid"
              _step="party-uuid"
              _key="party-uuids"
@@ -737,16 +742,18 @@
              _in-xml-name="party-uuid"
              _in-json-name="party-uuids"
              gi="party-uuid"
-             in-json="SCALAR"/>
+             in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="j:array[@key='party-uuids']/j:"
+   <xsl:template match="j:array[@key='party-uuids']/j:string"
                  mode="get-value-property"
                  priority="7">
-      <value>
+      <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:[@key='as-is']">
+   <xsl:template match="j:boolean[@key='as-is']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="as-is" -->
       <field _metaschema-xml-id="/assembly/oscal-profile/merge/as-is"
@@ -755,7 +762,7 @@
              as-type="boolean"
              name="as-is"
              key="as-is"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
              _key-name="oscal-profile:as-is"
              _step="as-is"
              _key="as-is"
@@ -768,14 +775,17 @@
          <xsl:if test="$with-key">
             <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:[@key='as-is']" mode="get-value-property" priority="5">
-      <value>
+   <xsl:template match="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:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'])">
+   <xsl:template match="(j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'])">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="value" -->
       <field _metaschema-xml-id="/assembly/oscal-catalog-common/parameter/value"
@@ -783,7 +793,7 @@
              collapsible="no"
              as-type="string"
              name="parameter-value"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
              _key-name="oscal-catalog-common:parameter-value"
              _step="value"
              _key="values"
@@ -792,12 +802,14 @@
              _in-xml-name="value"
              _in-json-name="values"
              gi="value"
-             in-json="SCALAR"/>
+             in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="(j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:array[@key='values']/j: | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'])"
+   <xsl:template match="(j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:array[@key='values']/j:string | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'] | j:string[@key='value'])"
                  mode="get-value-property"
                  priority="12">
-      <value>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -809,7 +821,7 @@
              collapsible="no"
              as-type="string"
              name="hash"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:hash"
              _step="hash"
              _key="hashes"
@@ -987,7 +999,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/link/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -1067,7 +1079,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/address/type"
             name="location-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:location-type"
             _step="type"
             _key="type"
@@ -1205,7 +1217,7 @@
             _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/with-child-controls"
             name="with-child-controls"
             key="with-child-controls"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
             _key-name="oscal-profile:with-child-controls"
             _step="with-child-controls"
             _key="with-child-controls"
@@ -1227,7 +1239,7 @@
             _metaschema-json-id="/assembly/oscal-profile/select-control-by-id/matching/pattern"
             name="pattern"
             key="pattern"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
             _key-name="oscal-profile:pattern"
             _step="pattern"
             _key="pattern"
@@ -1249,7 +1261,7 @@
             _metaschema-json-id="/assembly/oscal-profile/combine/method"
             name="method"
             key="method"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
             _key-name="oscal-profile:method"
             _step="method"
             _key="method"
@@ -1347,7 +1359,7 @@
             _metaschema-json-id="/assembly/oscal-catalog-common/parameter/depends-on"
             name="depends-on"
             key="depends-on"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
             _key-name="oscal-catalog-common:depends-on"
             _step="depends-on"
             _key="depends-on"
@@ -1523,7 +1535,7 @@
             _metaschema-json-id="/assembly/oscal-profile/modify/set-parameters/depends-on"
             name="depends-on"
             key="depends-on"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
             _key-name="oscal-catalog-common:depends-on"
             _step="depends-on"
             _key="depends-on"
@@ -1545,7 +1557,7 @@
             _metaschema-json-id="/assembly/oscal-profile/alter/control-id"
             name="control-id"
             key="control-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
             _key-name="oscal-catalog-common:control-id"
             _step="control-id"
             _key="control-id"
@@ -1740,7 +1752,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -1801,7 +1813,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -1816,7 +1828,7 @@
    <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>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:[@key='title']"
+   <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/metadata/title" -->
@@ -1836,16 +1848,17 @@
          <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:[@key='title']"
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:string[@key='title']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='published']"
+   <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/metadata/published" -->
@@ -1855,7 +1868,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -1868,16 +1881,17 @@
          <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:[@key='published']"
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:string[@key='published']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='last-modified']"
+   <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/metadata/last-modified" -->
@@ -1887,7 +1901,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -1900,16 +1914,17 @@
          <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:[@key='last-modified']"
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:string[@key='last-modified']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='version']"
+   <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/metadata/version" -->
@@ -1919,7 +1934,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -1932,16 +1947,17 @@
          <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:[@key='version']"
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:string[@key='version']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='oscal-version']"
+   <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/metadata/oscal-version" -->
@@ -1951,7 +1967,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -1964,12 +1980,13 @@
          <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:[@key='oscal-version']"
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:string[@key='oscal-version']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -1980,7 +1997,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/revisions/revision"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/revisions"
                 name="revision"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:revision"
                 _step="revisions/revision"
                 _key="revisions"
@@ -2008,7 +2025,7 @@
              group-json="ARRAY"
              name="revision"
              key="revisions"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:revision"
              _key-ref="oscal-metadata:revision">
          <xsl:if test="$with-key">
@@ -2017,7 +2034,7 @@
          <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:[@key='title']"
+   <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/metadata/revisions/revision/title" -->
@@ -2037,16 +2054,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='published']"
+   <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/metadata/revisions/revision/published" -->
@@ -2056,7 +2074,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -2069,16 +2087,17 @@
          <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:[@key='published']"
+   <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>
+      <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:[@key='last-modified']"
+   <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/metadata/revisions/revision/last-modified" -->
@@ -2088,7 +2107,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -2101,16 +2120,17 @@
          <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:[@key='last-modified']"
+   <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>
+      <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:[@key='version']"
+   <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/metadata/revisions/revision/version" -->
@@ -2120,7 +2140,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -2133,16 +2153,17 @@
          <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:[@key='version']"
+   <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>
+      <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:[@key='oscal-version']"
+   <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/metadata/revisions/revision/oscal-version" -->
@@ -2152,7 +2173,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -2165,16 +2186,17 @@
          <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:[@key='oscal-version']"
+   <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>
+      <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:[@key='text']"
+   <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/metadata/revisions/revision/link/text" -->
@@ -2194,12 +2216,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -2212,7 +2235,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -2232,7 +2255,7 @@
          <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:[@key='text']"
+   <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/metadata/link/text" -->
@@ -2252,16 +2275,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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/metadata/role/title" -->
@@ -2281,16 +2305,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='short-name']"
+   <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/metadata/role/short-name" -->
@@ -2310,16 +2335,17 @@
          <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:[@key='short-name']"
+   <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>
+      <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:[@key='description']"
+   <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/metadata/role/description" -->
@@ -2340,16 +2366,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/metadata/role/link/text" -->
@@ -2369,16 +2396,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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/metadata/location/title" -->
@@ -2398,12 +2426,13 @@
          <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:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -2415,7 +2444,7 @@
                 _metaschema-json-id="/assembly/oscal-metadata/location/address"
                 name="address"
                 key="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="address"
@@ -2435,7 +2464,7 @@
          <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:"
+   <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" -->
@@ -2444,7 +2473,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -2453,16 +2482,18 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='city']"
+   <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/metadata/location/address/city" -->
@@ -2482,16 +2513,17 @@
          <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:[@key='city']"
+   <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>
+      <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:[@key='state']"
+   <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/metadata/location/address/state" -->
@@ -2511,16 +2543,17 @@
          <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:[@key='state']"
+   <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>
+      <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:[@key='postal-code']"
+   <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/metadata/location/address/postal-code" -->
@@ -2540,16 +2573,17 @@
          <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:[@key='postal-code']"
+   <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>
+      <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:[@key='country']"
+   <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/metadata/location/address/country" -->
@@ -2569,16 +2603,17 @@
          <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:[@key='country']"
+   <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>
+      <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:"
+   <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/metadata/location/email-address" -->
@@ -2587,7 +2622,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -2596,12 +2631,14 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -2614,7 +2651,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -2634,7 +2671,7 @@
          <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:"
+   <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="profile/metadata/location/url" -->
@@ -2649,16 +2686,18 @@
              _in-xml-name="url"
              _in-json-name="urls"
              gi="url"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='text']"
+   <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="profile/metadata/location/link/text" -->
@@ -2678,16 +2717,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='name']"
+   <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" -->
@@ -2707,16 +2747,17 @@
          <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:[@key='name']"
+   <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>
+      <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:[@key='short-name']"
+   <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="profile/metadata/party/short-name" -->
@@ -2736,12 +2777,13 @@
          <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:[@key='short-name']"
+   <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>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -2771,7 +2813,7 @@
          <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:[@key='text']"
+   <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="profile/metadata/party/link/text" -->
@@ -2791,16 +2833,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:"
+   <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="profile/metadata/party/email-address" -->
@@ -2809,7 +2852,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -2818,12 +2861,14 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -2836,7 +2881,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -2863,7 +2908,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/party/address"
                 _metaschema-json-id="/assembly/oscal-metadata/party/addresses"
                 name="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="addresses"
@@ -2880,7 +2925,7 @@
          <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:"
+   <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" -->
@@ -2889,7 +2934,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -2898,16 +2943,18 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='city']"
+   <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="profile/metadata/party/address/city" -->
@@ -2927,16 +2974,17 @@
          <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:[@key='city']"
+   <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>
+      <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:[@key='state']"
+   <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="profile/metadata/party/address/state" -->
@@ -2956,16 +3004,17 @@
          <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:[@key='state']"
+   <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>
+      <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:[@key='postal-code']"
+   <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="profile/metadata/party/address/postal-code" -->
@@ -2985,16 +3034,17 @@
          <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:[@key='postal-code']"
+   <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>
+      <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:[@key='country']"
+   <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="profile/metadata/party/address/country" -->
@@ -3014,16 +3064,17 @@
          <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:[@key='country']"
+   <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>
+      <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:"
+   <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="profile/metadata/party/member-of-organization" -->
@@ -3038,16 +3089,18 @@
              _in-xml-name="member-of-organization"
              _in-json-name="member-of-organizations"
              gi="member-of-organization"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='text']"
+   <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="profile/metadata/responsible-party/link/text" -->
@@ -3067,12 +3120,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3083,7 +3137,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/import/include-controls"
                 _metaschema-json-id="/assembly/oscal-profile/import/include-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:select-control-by-id"
                 _step="include-controls"
                 _key="include-controls"
@@ -3097,7 +3151,7 @@
          <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:"
+   <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:param name="with-key" select="true()"/>
       <!-- XML match="profile/import/include-controls/with-id" -->
@@ -3112,12 +3166,14 @@
              _in-xml-name="with-id"
              _in-json-name="with-ids"
              gi="with-id"
-             in-json="SCALAR"/>
+             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='include-controls']/j:map/j:array[@key='with-ids']/j:"
+   <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>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3145,7 +3201,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/import/exclude-controls"
                 _metaschema-json-id="/assembly/oscal-profile/import/exclude-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:select-control-by-id"
                 _step="exclude-controls"
                 _key="exclude-controls"
@@ -3159,7 +3215,7 @@
          <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:"
+   <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" -->
@@ -3174,12 +3230,14 @@
              _in-xml-name="with-id"
              _in-json-name="with-ids"
              gi="with-id"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3200,7 +3258,7 @@
          <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:[@key='title']"
+   <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="profile/merge/custom//group/title" -->
@@ -3220,16 +3278,17 @@
          <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='groups']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='text']"
+   <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="profile/merge/custom//group/param/link/text" -->
@@ -3249,16 +3308,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='label']"
+   <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="profile/merge/custom//group/param/label" -->
@@ -3278,16 +3338,17 @@
          <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='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:[@key='label']"
+   <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>
+      <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:[@key='usage']"
+   <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="profile/merge/custom//group/param/usage" -->
@@ -3308,16 +3369,17 @@
          <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='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:[@key='usage']"
+   <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>
+      <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:[@key='description']"
+   <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="profile/merge/custom//group/param/constraint/description" -->
@@ -3338,12 +3400,13 @@
          <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='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:[@key='description']"
+   <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>
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3364,7 +3427,7 @@
          <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:[@key='expression']"
+   <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" -->
@@ -3384,20 +3447,21 @@
          <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='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:[@key='expression']"
+   <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>
+      <value as-type="string" 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='guidelines']/j:map"
-                 priority="12">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/merge/custom//group/param/guideline" -->
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+   <!-- 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="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _key="prose"
              _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
              _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
@@ -3408,21 +3472,16 @@
              key="prose"
              _using-name="prose"
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+             _in-json-name="prose">
+         <value as-type="markup-multiline"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6/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:array[@key='guidelines']/j:map"
-                 mode="get-value-property"
-                 priority="12">
-      <value>
-         <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:map[@key='select']/j:array[@key='choice']/j:"
+   <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" -->
@@ -3437,16 +3496,18 @@
              _in-xml-name="choice"
              _in-json-name="choice"
              gi="choice"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='text']"
+   <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="profile/merge/custom//group/link/text" -->
@@ -3466,16 +3527,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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="profile/merge/custom//group//part/title" -->
@@ -3495,20 +3557,21 @@
          <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='groups']/j:map//j:array[@key='parts']/j:map/j:[@key='title']"
+   <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>
+      <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"
-                 priority="10">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/merge/custom//group//part" -->
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+   <!-- 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="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _key="prose"
              _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
              _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
@@ -3519,21 +3582,16 @@
              key="prose"
              _using-name="prose"
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+             _in-json-name="prose">
+         <value as-type="markup-multiline"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6/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='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map//j:array[@key='parts']/j:map"
-                 mode="get-value-property"
-                 priority="10">
-      <value>
-         <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:array[@key='links']/j:map/j:[@key='text']"
+   <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="profile/merge/custom//group//part/link/text" -->
@@ -3553,12 +3611,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3569,7 +3628,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/insert-controls/include-controls"
                 _metaschema-json-id="/assembly/oscal-profile/insert-controls/include-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:select-control-by-id"
                 _step="include-controls"
                 _key="include-controls"
@@ -3583,7 +3642,7 @@
          <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:"
+   <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" -->
@@ -3598,12 +3657,14 @@
              _in-xml-name="with-id"
              _in-json-name="with-ids"
              gi="with-id"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3631,7 +3692,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/insert-controls/exclude-controls"
                 _metaschema-json-id="/assembly/oscal-profile/insert-controls/exclude-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:select-control-by-id"
                 _step="exclude-controls"
                 _key="exclude-controls"
@@ -3645,7 +3706,7 @@
          <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:"
+   <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" -->
@@ -3660,12 +3721,14 @@
              _in-xml-name="with-id"
              _in-json-name="with-ids"
              gi="with-id"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3693,7 +3756,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/insert-controls/include-controls"
                 _metaschema-json-id="/assembly/oscal-profile/insert-controls/include-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:select-control-by-id"
                 _step="include-controls"
                 _key="include-controls"
@@ -3707,7 +3770,7 @@
          <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:"
+   <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" -->
@@ -3722,12 +3785,14 @@
              _in-xml-name="with-id"
              _in-json-name="with-ids"
              gi="with-id"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3755,7 +3820,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-profile/insert-controls/exclude-controls"
                 _metaschema-json-id="/assembly/oscal-profile/insert-controls/exclude-controls"
                 name="select-control-by-id"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_profile_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_profile_metaschema.xml"
                 _key-name="oscal-profile:select-control-by-id"
                 _step="exclude-controls"
                 _key="exclude-controls"
@@ -3769,7 +3834,7 @@
          <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:"
+   <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" -->
@@ -3784,12 +3849,14 @@
              _in-xml-name="with-id"
              _in-json-name="with-ids"
              gi="with-id"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3836,7 +3903,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -3856,16 +3923,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='set-parameters']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='label']"
+   <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="profile/modify/set-parameter/label" -->
@@ -3885,16 +3953,17 @@
          <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='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:[@key='label']"
+   <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>
+      <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:[@key='usage']"
+   <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="profile/modify/set-parameter/usage" -->
@@ -3915,16 +3984,17 @@
          <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='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:[@key='usage']"
+   <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>
+      <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:[@key='description']"
+   <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="profile/modify/set-parameter/constraint/description" -->
@@ -3945,12 +4015,13 @@
          <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:[@key='description']"
+   <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>
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3971,7 +4042,7 @@
          <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:[@key='expression']"
+   <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" -->
@@ -3991,20 +4062,21 @@
          <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='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:[@key='expression']"
+   <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>
+      <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='guidelines']/j:map"
-                 priority="8">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/modify/set-parameter/guideline" -->
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+   <!-- 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="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _key="prose"
              _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
              _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
@@ -4015,21 +4087,16 @@
              key="prose"
              _using-name="prose"
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+             _in-json-name="prose">
+         <value as-type="markup-multiline"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6/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='modify']/j:array[@key='set-parameters']/j:map/j:array[@key='guidelines']/j:map"
-                 mode="get-value-property"
-                 priority="8">
-      <value>
-         <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:map[@key='select']/j:array[@key='choice']/j:"
+   <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="profile/modify/set-parameter/select/choice" -->
@@ -4044,16 +4111,18 @@
              _in-xml-name="choice"
              _in-json-name="choice"
              gi="choice"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='title']"
+   <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" -->
@@ -4073,16 +4142,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='text']"
+   <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="profile/modify/alter/add/param/link/text" -->
@@ -4102,16 +4172,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='label']"
+   <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="profile/modify/alter/add/param/label" -->
@@ -4131,16 +4202,17 @@
          <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='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:[@key='label']"
+   <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>
+      <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:[@key='usage']"
+   <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="profile/modify/alter/add/param/usage" -->
@@ -4161,16 +4233,17 @@
          <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='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:[@key='usage']"
+   <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>
+      <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:[@key='description']"
+   <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="profile/modify/alter/add/param/constraint/description" -->
@@ -4191,12 +4264,13 @@
          <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='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:[@key='description']"
+   <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>
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -4217,7 +4291,7 @@
          <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:[@key='expression']"
+   <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" -->
@@ -4237,20 +4311,21 @@
          <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='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:[@key='expression']"
+   <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>
+      <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='guidelines']/j:map"
-                 priority="12">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/modify/alter/add/param/guideline" -->
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+   <!-- 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="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _key="prose"
              _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6"
              _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
@@ -4261,21 +4336,16 @@
              key="prose"
              _using-name="prose"
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+             _in-json-name="prose">
+         <value as-type="markup-multiline"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/p ul ol pre table h1 h2 h3 h4 h5 h6/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='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"
-                 mode="get-value-property"
-                 priority="12">
-      <value>
-         <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:map[@key='select']/j:array[@key='choice']/j:"
+   <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" -->
@@ -4290,16 +4360,18 @@
              _in-xml-name="choice"
              _in-json-name="choice"
              gi="choice"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='text']"
+   <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="profile/modify/alter/add/link/text" -->
@@ -4319,16 +4391,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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="profile/modify/alter/add//part/title" -->
@@ -4348,20 +4421,21 @@
          <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='parts']/j:map/j:[@key='title']"
+   <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>
+      <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"
-                 priority="10">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/modify/alter/add//part" -->
-      <field _step="p ul ol pre table h1 h2 h3 h4 h5 h6"
+   <!-- 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="p ul ol pre table h1 h2 h3 h4 h5 h6"
              _key="prose"
              _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6"
              _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
@@ -4372,21 +4446,16 @@
              key="prose"
              _using-name="prose"
              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">prose</xsl:attribute>
-         </xsl:if>
+             _in-json-name="prose">
+         <value as-type="markup-multiline"
+                _metaschema-xml-id="/assembly/oscal-catalog-common/part/p ul ol pre table h1 h2 h3 h4 h5 h6/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"
-                 mode="get-value-property"
-                 priority="10">
-      <value>
-         <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:array[@key='links']/j:map/j:[@key='text']"
+   <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="profile/modify/alter/add//part/link/text" -->
@@ -4406,12 +4475,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -4439,7 +4509,7 @@
          <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:[@key='title']"
+   <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="profile/back-matter/resource/title" -->
@@ -4459,16 +4529,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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="profile/back-matter/resource/description" -->
@@ -4489,12 +4560,13 @@
          <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='back-matter']/j:array[@key='resources']/j:map/j:[@key='description']"
+   <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>
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -4507,7 +4579,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -4549,7 +4621,7 @@
          <xsl:apply-templates select="*[@key='links']"/>
       </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:[@key='text']"
+   <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="profile/back-matter/resource/citation/text" -->
@@ -4569,16 +4641,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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="profile/back-matter/resource/citation/link/text" -->
@@ -4598,12 +4671,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -4693,11 +4767,11 @@
       <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"/>
diff --git a/xml/convert/oscal_ssp_json-to-xml-converter.xsl b/xml/convert/oscal_ssp_json-to-xml-converter.xsl
index 77104259c6..30077f77c1 100644
--- a/xml/convert/oscal_ssp_json-to-xml-converter.xsl
+++ b/xml/convert/oscal_ssp_json-to-xml-converter.xsl
@@ -78,7 +78,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-security-plan"
                 name="system-security-plan"
                 key="system-security-plan"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:system-security-plan"
                 _using-root-name="system-security-plan"
                 gi="system-security-plan">
@@ -104,7 +104,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-security-plan/metadata"
                 name="metadata"
                 key="metadata"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:metadata"
                 _step="metadata"
                 _key="metadata"
@@ -138,7 +138,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/revision/prop"
                 _metaschema-json-id="/assembly/oscal-metadata/revision/props"
                 name="property"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:property"
                 _step="prop"
                 _key="props"
@@ -161,7 +161,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/revision/link"
                 _metaschema-json-id="/assembly/oscal-metadata/revision/links"
                 name="link"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:link"
                 _step="link"
                 _key="links"
@@ -182,7 +182,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/role"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/roles"
                 name="role"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:role"
                 _step="role"
                 _key="roles"
@@ -206,7 +206,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/location"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/locations"
                 name="location"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:location"
                 _step="location"
                 _key="locations"
@@ -232,7 +232,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/party"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/parties"
                 name="party"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:party"
                 _step="party"
                 _key="parties"
@@ -262,7 +262,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/responsible-party"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/responsible-parties"
                 name="responsible-party"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:responsible-party"
                 _step="responsible-party"
                 _key="responsible-parties"
@@ -285,7 +285,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-security-plan/import-profile"
                 name="import-profile"
                 key="import-profile"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:import-profile"
                 _step="import-profile"
                 _key="import-profile"
@@ -308,7 +308,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-security-plan/system-characteristics"
                 name="system-characteristics"
                 key="system-characteristics"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:system-characteristics"
                 _step="system-characteristics"
                 _key="system-characteristics"
@@ -345,7 +345,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/system-information"
                 name="system-information"
                 key="system-information"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:system-information"
                 _step="system-information"
                 _key="system-information"
@@ -369,7 +369,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/security-impact-level"
                 name="security-impact-level"
                 key="security-impact-level"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:security-impact-level"
                 _step="security-impact-level"
                 _key="security-impact-level"
@@ -393,7 +393,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/authorization-boundary"
                 name="authorization-boundary"
                 key="authorization-boundary"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:authorization-boundary"
                 _step="authorization-boundary"
                 _key="authorization-boundary"
@@ -418,7 +418,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ssp/authorization-boundary/diagram"
                 _metaschema-json-id="/assembly/oscal-ssp/authorization-boundary/diagrams"
                 name="diagram"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:diagram"
                 _step="diagram"
                 _key="diagrams"
@@ -442,7 +442,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/network-architecture"
                 name="network-architecture"
                 key="network-architecture"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:network-architecture"
                 _step="network-architecture"
                 _key="network-architecture"
@@ -468,7 +468,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/data-flow"
                 name="data-flow"
                 key="data-flow"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:data-flow"
                 _step="data-flow"
                 _key="data-flow"
@@ -494,7 +494,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-security-plan/system-implementation"
                 name="system-implementation"
                 key="system-implementation"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:system-implementation"
                 _step="system-implementation"
                 _key="system-implementation"
@@ -521,7 +521,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-implementation/user"
                 _metaschema-json-id="/assembly/oscal-ssp/system-implementation/users"
                 name="system-user"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:system-user"
                 _step="user"
                 _key="users"
@@ -547,7 +547,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/authorized-privilege"
                 _metaschema-json-id="/assembly/oscal-implementation-common/system-user/authorized-privileges"
                 name="authorized-privilege"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:authorized-privilege"
                 _step="authorized-privilege"
                 _key="authorized-privileges"
@@ -567,7 +567,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-implementation/component"
                 _metaschema-json-id="/assembly/oscal-ssp/system-implementation/components"
                 name="system-component"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:system-component"
                 _step="component"
                 _key="components"
@@ -595,7 +595,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/responsible-role"
                 _metaschema-json-id="/assembly/oscal-implementation-common/system-component/responsible-roles"
                 name="responsible-role"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:responsible-role"
                 _step="responsible-role"
                 _key="responsible-roles"
@@ -617,7 +617,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-implementation-common/system-component/protocol"
                 _metaschema-json-id="/assembly/oscal-implementation-common/system-component/protocols"
                 name="protocol"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:protocol"
                 _step="protocol"
                 _key="protocols"
@@ -639,7 +639,7 @@
                 _metaschema-xml-id="/assembly/oscal-implementation-common/protocol/port-range"
                 _metaschema-json-id="/assembly/oscal-implementation-common/protocol/port-ranges"
                 name="port-range"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:port-range"
                 _step="port-range"
                 _key="port-ranges"
@@ -659,7 +659,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ssp/system-implementation/inventory-item"
                 _metaschema-json-id="/assembly/oscal-ssp/system-implementation/inventory-items"
                 name="inventory-item"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:inventory-item"
                 _step="inventory-item"
                 _key="inventory-items"
@@ -683,7 +683,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ssp/control-implementation/set-parameter"
                 _metaschema-json-id="/assembly/oscal-ssp/control-implementation/set-parameters"
                 name="set-parameter"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:set-parameter"
                 _step="set-parameter"
                 _key="set-parameters"
@@ -703,7 +703,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ssp/statement/by-component"
                 _metaschema-json-id="/assembly/oscal-ssp/statement/by-components"
                 name="by-component"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:by-component"
                 _step="by-component"
                 _key="by-components"
@@ -733,7 +733,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/by-component/implementation-status"
                 name="implementation-status"
                 key="implementation-status"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
                 _key-name="oscal-implementation-common:implementation-status"
                 _step="implementation-status"
                 _key="implementation-status"
@@ -756,7 +756,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-security-plan/back-matter"
                 name="back-matter"
                 key="back-matter"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:back-matter"
                 _step="back-matter"
                 _key="back-matter"
@@ -771,7 +771,7 @@
          <xsl:apply-templates select="*[@key='resources']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:[@key='remarks']">
+   <xsl:template match="j:string[@key='remarks']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="remarks" -->
       <field _metaschema-xml-id="/assembly/oscal-metadata/property/remarks"
@@ -781,7 +781,7 @@
              as-type="markup-multiline"
              name="remarks"
              key="remarks"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:remarks"
              _step="remarks"
              _key="remarks"
@@ -794,14 +794,17 @@
          <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:[@key='remarks']" mode="get-value-property" priority="8">
-      <value>
+   <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:">
+   <xsl:template match="j:array[@key='location-uuids']/j:string">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="location-uuid" -->
       <field _metaschema-xml-id="/assembly/oscal-metadata/party/location-uuid"
@@ -809,7 +812,7 @@
              collapsible="no"
              as-type="uuid"
              name="location-uuid"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:location-uuid"
              _step="location-uuid"
              _key="location-uuids"
@@ -818,16 +821,18 @@
              _in-xml-name="location-uuid"
              _in-json-name="location-uuids"
              gi="location-uuid"
-             in-json="SCALAR"/>
+             in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="j:array[@key='location-uuids']/j:"
+   <xsl:template match="j:array[@key='location-uuids']/j:string"
                  mode="get-value-property"
                  priority="8">
-      <value>
+      <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="(j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:[@key='party-uuid'] | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j:)">
+   <xsl:template match="(j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:string[@key='party-uuid'] | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string)">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="party-uuid" -->
       <field _metaschema-xml-id="/assembly/oscal-metadata/responsible-party/party-uuid"
@@ -835,7 +840,7 @@
              collapsible="no"
              as-type="uuid"
              name="party-uuid"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:party-uuid"
              _step="party-uuid"
              _key="party-uuids"
@@ -844,12 +849,14 @@
              _in-xml-name="party-uuid"
              _in-json-name="party-uuids"
              gi="party-uuid"
-             in-json="SCALAR"/>
+             in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="(j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:[@key='party-uuid'] | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j: | j:array[@key='party-uuids']/j:)"
+   <xsl:template match="(j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:string[@key='party-uuid'] | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string | j:array[@key='party-uuids']/j:string)"
                  mode="get-value-property"
                  priority="7">
-      <value>
+      <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -861,7 +868,7 @@
              collapsible="no"
              as-type="string"
              name="system-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
              _key-name="oscal-implementation-common:system-id"
              _step="system-id"
              _key="system-ids"
@@ -880,7 +887,7 @@
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
-   <xsl:template match="(j:string[@key='role-id'] | j:string[@key='role-id'] | j:array[@key='role-ids']/j: | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'])">
+   <xsl:template match="(j:string[@key='role-id'] | j:string[@key='role-id'] | j:array[@key='role-ids']/j:string | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'])">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="role-id" -->
       <field _metaschema-xml-id="/assembly/oscal-implementation-common/system-user/role-id"
@@ -888,7 +895,7 @@
              collapsible="no"
              as-type="token"
              name="role-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:role-id"
              _step="role-id"
              _key="role-ids"
@@ -897,16 +904,18 @@
              _in-xml-name="role-id"
              _in-json-name="role-ids"
              gi="role-id"
-             in-json="SCALAR"/>
+             in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="(j:string[@key='role-id'] | j:string[@key='role-id'] | j:array[@key='role-ids']/j: | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'])"
+   <xsl:template match="(j:string[@key='role-id'] | j:string[@key='role-id'] | j:array[@key='role-ids']/j:string | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'] | j:string[@key='role-id'])"
                  mode="get-value-property"
                  priority="7">
-      <value>
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:array[@key='functions-performed']/j:">
+   <xsl:template match="j:array[@key='functions-performed']/j:string">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="function-performed" -->
       <field _metaschema-xml-id="/assembly/oscal-implementation-common/authorized-privilege/function-performed"
@@ -914,7 +923,7 @@
              collapsible="no"
              as-type="string"
              name="function-performed"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
              _key-name="oscal-implementation-common:function-performed"
              _step="function-performed"
              _key="functions-performed"
@@ -923,12 +932,14 @@
              _in-xml-name="function-performed"
              _in-json-name="functions-performed"
              gi="function-performed"
-             in-json="SCALAR"/>
+             in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="j:array[@key='functions-performed']/j:"
+   <xsl:template match="j:array[@key='functions-performed']/j:string"
                  mode="get-value-property"
                  priority="9">
-      <value>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -940,7 +951,7 @@
              collapsible="no"
              as-type="string"
              name="hash"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:hash"
              _step="hash"
              _key="hashes"
@@ -1118,7 +1129,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/link/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -1198,7 +1209,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/address/type"
             name="location-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:location-type"
             _step="type"
             _key="type"
@@ -1492,7 +1503,7 @@
             _metaschema-json-id="/assembly/oscal-implementation-common/system-component/type"
             name="system-component-type"
             key="type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
             _key-name="oscal-implementation-common:system-component-type"
             _step="type"
             _key="type"
@@ -1687,7 +1698,7 @@
             _metaschema-json-id="/assembly/oscal-implementation-common/set-parameter/param-id"
             name="param-id"
             key="param-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
             _key-name="oscal-implementation-common:param-id"
             _step="param-id"
             _key="param-id"
@@ -1729,7 +1740,7 @@
             _metaschema-json-id="/assembly/oscal-ssp/implemented-requirement/control-id"
             name="control-id"
             key="control-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_control-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_control-common_metaschema.xml"
             _key-name="oscal-catalog-common:control-id"
             _step="control-id"
             _key="control-id"
@@ -1751,7 +1762,7 @@
             _metaschema-json-id="/assembly/oscal-ssp/statement/statement-id"
             name="statement-id"
             key="statement-id"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_implementation-common_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_implementation-common_metaschema.xml"
             _key-name="oscal-implementation-common:statement-id"
             _step="statement-id"
             _key="statement-id"
@@ -1890,7 +1901,7 @@
             _metaschema-json-id="/assembly/oscal-ssp/by-component/export/responsibilities/provided-uuid"
             name="provided-uuid"
             key="provided-uuid"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
             _key-name="oscal-ssp:provided-uuid"
             _step="provided-uuid"
             _key="provided-uuid"
@@ -1932,7 +1943,7 @@
             _metaschema-json-id="/assembly/oscal-ssp/by-component/inherited/provided-uuid"
             name="provided-uuid"
             key="provided-uuid"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
             _key-name="oscal-ssp:provided-uuid"
             _step="provided-uuid"
             _key="provided-uuid"
@@ -1974,7 +1985,7 @@
             _metaschema-json-id="/assembly/oscal-ssp/by-component/satisfied/responsibility-uuid"
             name="responsibility-uuid"
             key="responsibility-uuid"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
             _key-name="oscal-ssp:responsibility-uuid"
             _step="responsibility-uuid"
             _key="responsibility-uuid"
@@ -2036,7 +2047,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/rlinks/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -2097,7 +2108,7 @@
             _metaschema-json-id="/assembly/oscal-metadata/back-matter/resources/base64/media-type"
             name="media-type"
             key="media-type"
-            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+            _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
             _key-name="oscal-metadata:media-type"
             _step="media-type"
             _key="media-type"
@@ -2112,7 +2123,7 @@
    <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>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:[@key='title']"
+   <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/metadata/title" -->
@@ -2132,16 +2143,17 @@
          <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:[@key='title']"
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:string[@key='title']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='published']"
+   <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/metadata/published" -->
@@ -2151,7 +2163,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -2164,16 +2176,17 @@
          <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='system-security-plan']/j:map[@key='metadata']/j:[@key='published']"
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:string[@key='published']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='last-modified']"
+   <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/metadata/last-modified" -->
@@ -2183,7 +2196,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -2196,16 +2209,17 @@
          <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='system-security-plan']/j:map[@key='metadata']/j:[@key='last-modified']"
+   <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>
+      <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:[@key='version']"
+   <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/metadata/version" -->
@@ -2215,7 +2229,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -2228,16 +2242,17 @@
          <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='system-security-plan']/j:map[@key='metadata']/j:[@key='version']"
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:string[@key='version']"
                  mode="get-value-property"
                  priority="4">
-      <value>
+      <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:[@key='oscal-version']"
+   <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/metadata/oscal-version" -->
@@ -2247,7 +2262,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -2260,12 +2275,13 @@
          <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='system-security-plan']/j:map[@key='metadata']/j:[@key='oscal-version']"
+   <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>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -2276,7 +2292,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/metadata/revisions/revision"
                 _metaschema-json-id="/assembly/oscal-metadata/metadata/revisions"
                 name="revision"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:revision"
                 _step="revisions/revision"
                 _key="revisions"
@@ -2304,7 +2320,7 @@
              group-json="ARRAY"
              name="revision"
              key="revisions"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:revision"
              _key-ref="oscal-metadata:revision">
          <xsl:if test="$with-key">
@@ -2313,7 +2329,7 @@
          <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:[@key='title']"
+   <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" -->
@@ -2333,16 +2349,17 @@
          <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='revisions']/j:array[@key='revisions']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='published']"
+   <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/metadata/revisions/revision/published" -->
@@ -2352,7 +2369,7 @@
              as-type="dateTime-with-timezone"
              name="published"
              key="published"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:published"
              _step="published"
              _key="published"
@@ -2365,16 +2382,17 @@
          <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='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='published']"
+   <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>
+      <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:[@key='last-modified']"
+   <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/metadata/revisions/revision/last-modified" -->
@@ -2384,7 +2402,7 @@
              as-type="dateTime-with-timezone"
              name="last-modified"
              key="last-modified"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:last-modified"
              _step="last-modified"
              _key="last-modified"
@@ -2397,16 +2415,17 @@
          <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='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='last-modified']"
+   <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>
+      <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:[@key='version']"
+   <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/metadata/revisions/revision/version" -->
@@ -2416,7 +2435,7 @@
              as-type="string"
              name="version"
              key="version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:version"
              _step="version"
              _key="version"
@@ -2429,16 +2448,17 @@
          <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='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='version']"
+   <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>
+      <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:[@key='oscal-version']"
+   <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/metadata/revisions/revision/oscal-version" -->
@@ -2448,7 +2468,7 @@
              as-type="string"
              name="oscal-version"
              key="oscal-version"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:oscal-version"
              _step="oscal-version"
              _key="oscal-version"
@@ -2461,16 +2481,17 @@
          <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='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:[@key='oscal-version']"
+   <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>
+      <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:[@key='text']"
+   <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/metadata/revisions/revision/link/text" -->
@@ -2490,12 +2511,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -2508,7 +2530,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -2528,7 +2550,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -2548,16 +2570,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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/metadata/role/title" -->
@@ -2577,16 +2600,17 @@
          <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='roles']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='short-name']"
+   <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/metadata/role/short-name" -->
@@ -2606,16 +2630,17 @@
          <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='system-security-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:[@key='short-name']"
+   <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>
+      <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:[@key='description']"
+   <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/metadata/role/description" -->
@@ -2636,16 +2661,17 @@
          <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='roles']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/metadata/role/link/text" -->
@@ -2665,16 +2691,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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" -->
@@ -2694,12 +2721,13 @@
          <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:[@key='title']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -2711,7 +2739,7 @@
                 _metaschema-json-id="/assembly/oscal-metadata/location/address"
                 name="address"
                 key="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="address"
@@ -2731,7 +2759,7 @@
          <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:"
+   <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" -->
@@ -2740,7 +2768,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -2749,16 +2777,18 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='city']"
+   <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/metadata/location/address/city" -->
@@ -2778,16 +2808,17 @@
          <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='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:[@key='city']"
+   <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>
+      <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:[@key='state']"
+   <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/metadata/location/address/state" -->
@@ -2807,16 +2838,17 @@
          <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='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:[@key='state']"
+   <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>
+      <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:[@key='postal-code']"
+   <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/metadata/location/address/postal-code" -->
@@ -2836,16 +2868,17 @@
          <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='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:[@key='postal-code']"
+   <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>
+      <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:[@key='country']"
+   <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/metadata/location/address/country" -->
@@ -2865,16 +2898,17 @@
          <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='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:[@key='country']"
+   <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>
+      <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:"
+   <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" -->
@@ -2883,7 +2917,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -2892,12 +2926,14 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -2910,7 +2946,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -2930,7 +2966,7 @@
          <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:"
+   <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/metadata/location/url" -->
@@ -2945,16 +2981,18 @@
              _in-xml-name="url"
              _in-json-name="urls"
              gi="url"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='text']"
+   <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/metadata/location/link/text" -->
@@ -2974,16 +3012,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='name']"
+   <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" -->
@@ -3003,16 +3042,17 @@
          <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='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:[@key='name']"
+   <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>
+      <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:[@key='short-name']"
+   <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/metadata/party/short-name" -->
@@ -3032,12 +3072,13 @@
          <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='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:[@key='short-name']"
+   <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>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3067,7 +3108,7 @@
          <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:[@key='text']"
+   <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/metadata/party/link/text" -->
@@ -3087,16 +3128,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:"
+   <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/metadata/party/email-address" -->
@@ -3105,7 +3147,7 @@
              collapsible="no"
              as-type="email"
              name="email-address"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:email-address"
              _step="email-address"
              _key="email-addresses"
@@ -3114,12 +3156,14 @@
              _in-xml-name="email-address"
              _in-json-name="email-addresses"
              gi="email-address"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3132,7 +3176,7 @@
              collapsible="no"
              as-type="string"
              name="telephone-number"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:telephone-number"
              _step="telephone-number"
              _key="telephone-numbers"
@@ -3159,7 +3203,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-metadata/party/address"
                 _metaschema-json-id="/assembly/oscal-metadata/party/addresses"
                 name="address"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
                 _key-name="oscal-metadata:address"
                 _step="address"
                 _key="addresses"
@@ -3176,7 +3220,7 @@
          <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='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:"
+   <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/metadata/party/address/addr-line" -->
@@ -3185,7 +3229,7 @@
              collapsible="no"
              as-type="string"
              name="addr-line"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:addr-line"
              _step="addr-line"
              _key="addr-lines"
@@ -3194,16 +3238,18 @@
              _in-xml-name="addr-line"
              _in-json-name="addr-lines"
              gi="addr-line"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='city']"
+   <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/metadata/party/address/city" -->
@@ -3223,16 +3269,17 @@
          <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='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:[@key='city']"
+   <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>
+      <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:[@key='state']"
+   <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/metadata/party/address/state" -->
@@ -3252,16 +3299,17 @@
          <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='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:[@key='state']"
+   <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>
+      <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:[@key='postal-code']"
+   <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/metadata/party/address/postal-code" -->
@@ -3281,16 +3329,17 @@
          <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='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:[@key='postal-code']"
+   <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>
+      <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:[@key='country']"
+   <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/metadata/party/address/country" -->
@@ -3310,16 +3359,17 @@
          <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='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:[@key='country']"
+   <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>
+      <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:"
+   <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/metadata/party/member-of-organization" -->
@@ -3334,16 +3384,18 @@
              _in-xml-name="member-of-organization"
              _in-json-name="member-of-organizations"
              gi="member-of-organization"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='text']"
+   <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/metadata/responsible-party/link/text" -->
@@ -3363,16 +3415,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-parties']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='system-name']"
+   <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-characteristics/system-name" -->
@@ -3392,16 +3445,17 @@
          <xsl:if test="$with-key">
             <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-characteristics']/j:[@key='system-name']"
+   <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>
+      <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:[@key='system-name-short']"
+   <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-characteristics/system-name-short" -->
@@ -3421,16 +3475,17 @@
          <xsl:if test="$with-key">
             <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-characteristics']/j:[@key='system-name-short']"
+   <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>
+      <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:[@key='description']"
+   <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-characteristics/description" -->
@@ -3451,16 +3506,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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-characteristics/link/text" -->
@@ -3480,16 +3536,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='date-authorized']"
+   <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" -->
@@ -3499,7 +3556,7 @@
              as-type="date"
              name="date-authorized"
              key="date-authorized"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:date-authorized"
              _step="date-authorized"
              _key="date-authorized"
@@ -3512,16 +3569,17 @@
          <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:[@key='date-authorized']"
+   <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>
+      <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:[@key='security-sensitivity-level']"
+   <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-characteristics/security-sensitivity-level" -->
@@ -3541,16 +3599,17 @@
          <xsl:if test="$with-key">
             <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-characteristics']/j:[@key='security-sensitivity-level']"
+   <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>
+      <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:[@key='text']"
+   <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-characteristics/system-information/link/text" -->
@@ -3570,12 +3629,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3603,7 +3663,7 @@
          <xsl:apply-templates select="*[@key='availability-impact']"/>
       </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:[@key='title']"
+   <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/system-characteristics/system-information/information-type/title" -->
@@ -3623,16 +3683,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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/system-characteristics/system-information/information-type/description" -->
@@ -3653,12 +3714,13 @@
          <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='system-information']/j:array[@key='information-types']/j:map/j:[@key='description']"
+   <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>
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3679,7 +3741,7 @@
          <xsl:apply-templates select="*[@key='information-type-ids']"/>
       </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:"
+   <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/system-characteristics/system-information/information-type/categorization/information-type-id" -->
@@ -3694,16 +3756,18 @@
              _in-xml-name="information-type-id"
              _in-json-name="information-type-ids"
              gi="information-type-id"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='text']"
+   <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/system-characteristics/system-information/information-type/link/text" -->
@@ -3723,12 +3787,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3756,7 +3821,7 @@
          <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:[@key='text']"
+   <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/system-characteristics/system-information/information-type/confidentiality-impact/link/text" -->
@@ -3776,16 +3841,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='base']"
+   <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/system-characteristics/system-information/information-type/confidentiality-impact/base" -->
@@ -3795,7 +3861,7 @@
              as-type="string"
              name="base"
              key="base"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:base"
              _step="base"
              _key="base"
@@ -3808,16 +3874,17 @@
          <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='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='confidentiality-impact']/j:[@key='base']"
+   <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>
+      <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:[@key='selected']"
+   <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/system-characteristics/system-information/information-type/confidentiality-impact/selected" -->
@@ -3827,7 +3894,7 @@
              as-type="string"
              name="selected"
              key="selected"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:selected"
              _step="selected"
              _key="selected"
@@ -3840,16 +3907,17 @@
          <xsl:if test="$with-key">
             <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='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='confidentiality-impact']/j:[@key='selected']"
+   <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>
+      <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:[@key='adjustment-justification']"
+   <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/system-characteristics/system-information/information-type/confidentiality-impact/adjustment-justification" -->
@@ -3860,7 +3928,7 @@
              as-type="markup-multiline"
              name="adjustment-justification"
              key="adjustment-justification"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:adjustment-justification"
              _step="adjustment-justification"
              _key="adjustment-justification"
@@ -3873,12 +3941,13 @@
          <xsl:if test="$with-key">
             <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='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='confidentiality-impact']/j:[@key='adjustment-justification']"
+   <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>
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -3906,7 +3975,7 @@
          <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:[@key='text']"
+   <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/system-characteristics/system-information/information-type/integrity-impact/link/text" -->
@@ -3926,16 +3995,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='integrity-impact']/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='base']"
+   <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/system-characteristics/system-information/information-type/integrity-impact/base" -->
@@ -3945,7 +4015,7 @@
              as-type="string"
              name="base"
              key="base"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:base"
              _step="base"
              _key="base"
@@ -3958,16 +4028,17 @@
          <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='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='integrity-impact']/j:[@key='base']"
+   <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>
+      <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:[@key='selected']"
+   <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/system-characteristics/system-information/information-type/integrity-impact/selected" -->
@@ -3977,7 +4048,7 @@
              as-type="string"
              name="selected"
              key="selected"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:selected"
              _step="selected"
              _key="selected"
@@ -3990,16 +4061,17 @@
          <xsl:if test="$with-key">
             <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='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='integrity-impact']/j:[@key='selected']"
+   <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>
+      <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:[@key='adjustment-justification']"
+   <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/system-characteristics/system-information/information-type/integrity-impact/adjustment-justification" -->
@@ -4010,7 +4082,7 @@
              as-type="markup-multiline"
              name="adjustment-justification"
              key="adjustment-justification"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:adjustment-justification"
              _step="adjustment-justification"
              _key="adjustment-justification"
@@ -4023,12 +4095,13 @@
          <xsl:if test="$with-key">
             <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='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='integrity-impact']/j:[@key='adjustment-justification']"
+   <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>
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -4056,7 +4129,7 @@
          <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:[@key='text']"
+   <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/system-characteristics/system-information/information-type/availability-impact/link/text" -->
@@ -4076,16 +4149,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='availability-impact']/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='base']"
+   <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/system-characteristics/system-information/information-type/availability-impact/base" -->
@@ -4095,7 +4169,7 @@
              as-type="string"
              name="base"
              key="base"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:base"
              _step="base"
              _key="base"
@@ -4108,16 +4182,17 @@
          <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='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='availability-impact']/j:[@key='base']"
+   <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>
+      <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:[@key='selected']"
+   <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/system-characteristics/system-information/information-type/availability-impact/selected" -->
@@ -4127,7 +4202,7 @@
              as-type="string"
              name="selected"
              key="selected"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:selected"
              _step="selected"
              _key="selected"
@@ -4140,16 +4215,17 @@
          <xsl:if test="$with-key">
             <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='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='availability-impact']/j:[@key='selected']"
+   <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>
+      <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:[@key='adjustment-justification']"
+   <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/system-characteristics/system-information/information-type/availability-impact/adjustment-justification" -->
@@ -4160,7 +4236,7 @@
              as-type="markup-multiline"
              name="adjustment-justification"
              key="adjustment-justification"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:adjustment-justification"
              _step="adjustment-justification"
              _key="adjustment-justification"
@@ -4173,16 +4249,17 @@
          <xsl:if test="$with-key">
             <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='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='availability-impact']/j:[@key='adjustment-justification']"
+   <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>
+      <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:[@key='security-objective-confidentiality']"
+   <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/system-characteristics/security-impact-level/security-objective-confidentiality" -->
@@ -4202,16 +4279,17 @@
          <xsl:if test="$with-key">
             <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='system-characteristics']/j:map[@key='security-impact-level']/j:[@key='security-objective-confidentiality']"
+   <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>
+      <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:[@key='security-objective-integrity']"
+   <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/system-characteristics/security-impact-level/security-objective-integrity" -->
@@ -4231,16 +4309,17 @@
          <xsl:if test="$with-key">
             <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='system-characteristics']/j:map[@key='security-impact-level']/j:[@key='security-objective-integrity']"
+   <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>
+      <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:[@key='security-objective-availability']"
+   <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/system-characteristics/security-impact-level/security-objective-availability" -->
@@ -4260,12 +4339,13 @@
          <xsl:if test="$with-key">
             <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='system-characteristics']/j:map[@key='security-impact-level']/j:[@key='security-objective-availability']"
+   <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>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -4277,7 +4357,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-characteristics/status"
                 name="status"
                 key="status"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:status"
                 _step="status"
                 _key="status"
@@ -4293,7 +4373,7 @@
          <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:[@key='description']"
+   <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/system-characteristics/authorization-boundary/description" -->
@@ -4314,16 +4394,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/system-characteristics/authorization-boundary/link/text" -->
@@ -4343,16 +4424,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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/system-characteristics/authorization-boundary/diagram/description" -->
@@ -4373,16 +4455,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/system-characteristics/authorization-boundary/diagram/link/text" -->
@@ -4402,16 +4485,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='caption']"
+   <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/system-characteristics/authorization-boundary/diagram/caption" -->
@@ -4431,16 +4515,17 @@
          <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='system-characteristics']/j:map[@key='authorization-boundary']/j:array[@key='diagrams']/j:map/j:[@key='caption']"
+   <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>
+      <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:[@key='remarks']"
+   <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='remarks']"
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/authorization-boundary/diagram/remarks" -->
@@ -4461,16 +4546,17 @@
          <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:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='authorization-boundary']/j:array[@key='diagrams']/j:map/j:[@key='remarks']"
+   <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='remarks']"
                  mode="get-value-property"
                  priority="7">
-      <value>
+      <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:[@key='remarks']"
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='authorization-boundary']/j:string[@key='remarks']"
                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/authorization-boundary/remarks" -->
@@ -4491,16 +4577,17 @@
          <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:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='authorization-boundary']/j:[@key='remarks']"
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='authorization-boundary']/j:string[@key='remarks']"
                  mode="get-value-property"
                  priority="5">
-      <value>
+      <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:[@key='description']"
+   <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/system-characteristics/network-architecture/description" -->
@@ -4521,16 +4608,17 @@
          <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='network-architecture']/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/system-characteristics/network-architecture/link/text" -->
@@ -4550,16 +4638,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='network-architecture']/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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/system-characteristics/network-architecture/diagram/description" -->
@@ -4580,16 +4669,17 @@
          <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='network-architecture']/j:array[@key='diagrams']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/system-characteristics/network-architecture/diagram/link/text" -->
@@ -4609,16 +4699,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='network-architecture']/j:array[@key='diagrams']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='caption']"
+   <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/system-characteristics/network-architecture/diagram/caption" -->
@@ -4638,16 +4729,17 @@
          <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='system-characteristics']/j:map[@key='network-architecture']/j:array[@key='diagrams']/j:map/j:[@key='caption']"
+   <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>
+      <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:[@key='remarks']"
+   <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='remarks']"
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/network-architecture/diagram/remarks" -->
@@ -4668,16 +4760,17 @@
          <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:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='network-architecture']/j:array[@key='diagrams']/j:map/j:[@key='remarks']"
+   <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='remarks']"
                  mode="get-value-property"
                  priority="7">
-      <value>
+      <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:[@key='description']"
+   <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/system-characteristics/data-flow/description" -->
@@ -4698,16 +4791,17 @@
          <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='data-flow']/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/system-characteristics/data-flow/link/text" -->
@@ -4727,16 +4821,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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" -->
@@ -4757,16 +4852,17 @@
          <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='data-flow']/j:array[@key='diagrams']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/system-characteristics/data-flow/diagram/link/text" -->
@@ -4786,16 +4882,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='caption']"
+   <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/system-characteristics/data-flow/diagram/caption" -->
@@ -4815,16 +4912,17 @@
          <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='system-characteristics']/j:map[@key='data-flow']/j:array[@key='diagrams']/j:map/j:[@key='caption']"
+   <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>
+      <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:[@key='remarks']"
+   <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='remarks']"
                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/data-flow/diagram/remarks" -->
@@ -4845,16 +4943,17 @@
          <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:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='data-flow']/j:array[@key='diagrams']/j:map/j:[@key='remarks']"
+   <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='remarks']"
                  mode="get-value-property"
                  priority="7">
-      <value>
+      <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='responsible-parties']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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/system-characteristics/responsible-party/link/text" -->
@@ -4874,16 +4973,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-parties']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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/system-implementation/link/text" -->
@@ -4903,12 +5003,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -4934,7 +5035,7 @@
          <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:[@key='title']"
+   <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" -->
@@ -4954,16 +5055,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='text']"
+   <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/system-implementation/leveraged-authorization/link/text" -->
@@ -4983,16 +5085,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='party-uuid']"
+   <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/system-implementation/leveraged-authorization/party-uuid" -->
@@ -5012,16 +5115,17 @@
          <xsl:if test="$with-key">
             <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='system-implementation']/j:array[@key='leveraged-authorizations']/j:map/j:[@key='party-uuid']"
+   <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>
+      <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:[@key='date-authorized']"
+   <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/system-implementation/leveraged-authorization/date-authorized" -->
@@ -5031,7 +5135,7 @@
              as-type="date"
              name="date-authorized"
              key="date-authorized"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
              _key-name="oscal-ssp:date-authorized"
              _step="date-authorized"
              _key="date-authorized"
@@ -5044,16 +5148,17 @@
          <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-implementation']/j:array[@key='leveraged-authorizations']/j:map/j:[@key='date-authorized']"
+   <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>
+      <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:[@key='title']"
+   <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/system-implementation/user/title" -->
@@ -5073,16 +5178,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='short-name']"
+   <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/system-implementation/user/short-name" -->
@@ -5102,16 +5208,17 @@
          <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='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='users']/j:map/j:[@key='short-name']"
+   <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>
+      <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:[@key='description']"
+   <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/system-implementation/user/description" -->
@@ -5132,16 +5239,17 @@
          <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='users']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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/system-implementation/user/link/text" -->
@@ -5161,16 +5269,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='users']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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/system-implementation/user/authorized-privilege/title" -->
@@ -5190,16 +5299,17 @@
          <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:array[@key='authorized-privileges']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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/system-implementation/user/authorized-privilege/description" -->
@@ -5220,16 +5330,17 @@
          <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='users']/j:map/j:array[@key='authorized-privileges']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='title']"
+   <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/system-implementation/component/title" -->
@@ -5249,16 +5360,17 @@
          <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='components']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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/system-implementation/component/description" -->
@@ -5279,16 +5391,17 @@
          <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='components']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='purpose']"
+   <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/system-implementation/component/purpose" -->
@@ -5308,16 +5421,17 @@
          <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='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:[@key='purpose']"
+   <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>
+      <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:[@key='text']"
+   <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/system-implementation/component/link/text" -->
@@ -5337,12 +5451,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -5367,7 +5482,7 @@
          <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:[@key='text']"
+   <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/system-implementation/component/responsible-role/link/text" -->
@@ -5387,16 +5502,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='title']"
+   <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="system-security-plan/system-implementation/component/protocol/title" -->
@@ -5416,16 +5532,17 @@
          <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='components']/j:map/j:array[@key='protocols']/j:map/j:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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="system-security-plan/system-implementation/inventory-item/description" -->
@@ -5446,16 +5563,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/system-implementation/inventory-item/link/text" -->
@@ -5475,16 +5593,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/system-implementation/inventory-item/responsible-party/link/text" -->
@@ -5504,12 +5623,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-parties']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -5533,7 +5653,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -5553,16 +5673,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/system-implementation/inventory-item/implemented-component/responsible-party/link/text" -->
@@ -5582,12 +5703,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -5599,7 +5721,7 @@
                 _metaschema-json-id="/assembly/oscal-ssp/system-security-plan/control-implementation"
                 name="control-implementation"
                 key="control-implementation"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:control-implementation"
                 _step="control-implementation"
                 _key="control-implementation"
@@ -5616,7 +5738,7 @@
          <xsl:apply-templates select="*[@key='implemented-requirements']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:[@key='description']"
+   <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="system-security-plan/control-implementation/description" -->
@@ -5637,16 +5759,17 @@
          <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:[@key='description']"
+   <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>
+      <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:"
+   <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="system-security-plan/control-implementation/set-parameter/value" -->
@@ -5661,12 +5784,14 @@
              _in-xml-name="value"
              _in-json-name="values"
              gi="value"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -5677,7 +5802,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ssp/control-implementation/implemented-requirement"
                 _metaschema-json-id="/assembly/oscal-ssp/control-implementation/implemented-requirements"
                 name="implemented-requirement"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:implemented-requirement"
                 _step="implemented-requirement"
                 _key="implemented-requirements"
@@ -5697,7 +5822,7 @@
          <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='links']/j:map/j:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/link/text" -->
@@ -5717,16 +5842,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <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:"
+   <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="system-security-plan/control-implementation/implemented-requirement/set-parameter/value" -->
@@ -5741,16 +5867,18 @@
              _in-xml-name="value"
              _in-json-name="values"
              gi="value"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/responsible-role/link/text" -->
@@ -5770,12 +5898,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -5786,7 +5915,7 @@
       <assembly _metaschema-xml-id="/assembly/oscal-ssp/implemented-requirement/statement"
                 _metaschema-json-id="/assembly/oscal-ssp/implemented-requirement/statements"
                 name="statement"
-                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_ssp_metaschema.xml"
+                _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_ssp_metaschema.xml"
                 _key-name="oscal-ssp:statement"
                 _step="statement"
                 _key="statements"
@@ -5804,7 +5933,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -5824,16 +5953,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/statement/responsible-role/link/text" -->
@@ -5853,16 +5983,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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="system-security-plan/control-implementation/implemented-requirement/statement/by-component/description" -->
@@ -5883,16 +6014,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/statement/by-component/link/text" -->
@@ -5912,16 +6044,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:"
+   <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="system-security-plan/control-implementation/implemented-requirement/statement/by-component/set-parameter/value" -->
@@ -5936,12 +6069,14 @@
              _in-xml-name="value"
              _in-json-name="values"
              gi="value"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -5970,7 +6105,7 @@
          <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:[@key='description']"
+   <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="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/description" -->
@@ -5991,16 +6126,17 @@
          <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:map[@key='export']/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/link/text" -->
@@ -6020,12 +6156,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -6050,7 +6187,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -6071,16 +6208,17 @@
          <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:map[@key='export']/j:array[@key='provided']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided/link/text" -->
@@ -6100,16 +6238,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='provided']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided/responsible-role/link/text" -->
@@ -6129,12 +6268,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='provided']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -6160,7 +6300,7 @@
          <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:[@key='description']"
+   <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="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/description" -->
@@ -6181,16 +6321,17 @@
          <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:map[@key='export']/j:array[@key='responsibilities']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/link/text" -->
@@ -6210,16 +6351,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsibilities']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/responsible-role/link/text" -->
@@ -6239,12 +6381,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsibilities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -6269,7 +6412,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -6290,16 +6433,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/link/text" -->
@@ -6319,16 +6463,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/responsible-role/link/text" -->
@@ -6348,12 +6493,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -6379,7 +6525,7 @@
          <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:[@key='description']"
+   <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="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/description" -->
@@ -6400,16 +6546,17 @@
          <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='satisfied']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/link/text" -->
@@ -6429,16 +6576,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/responsible-role/link/text" -->
@@ -6458,16 +6606,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/statement/by-component/responsible-role/link/text" -->
@@ -6487,16 +6636,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='description']"
+   <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="system-security-plan/control-implementation/implemented-requirement/by-component/description" -->
@@ -6517,16 +6667,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/by-component/link/text" -->
@@ -6546,16 +6697,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:"
+   <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="system-security-plan/control-implementation/implemented-requirement/by-component/set-parameter/value" -->
@@ -6570,12 +6722,14 @@
              _in-xml-name="value"
              _in-json-name="values"
              gi="value"
-             in-json="SCALAR"/>
+             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:"
+   <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>
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -6604,7 +6758,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -6625,16 +6779,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/by-component/export/link/text" -->
@@ -6654,12 +6809,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -6684,7 +6840,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -6705,16 +6861,17 @@
          <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='provided']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/by-component/export/provided/link/text" -->
@@ -6734,16 +6891,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/by-component/export/provided/responsible-role/link/text" -->
@@ -6763,12 +6921,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -6794,7 +6953,7 @@
          <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:[@key='description']"
+   <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="system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/description" -->
@@ -6815,16 +6974,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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" -->
@@ -6844,16 +7004,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/responsible-role/link/text" -->
@@ -6873,12 +7034,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -6903,7 +7065,7 @@
          <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:[@key='description']"
+   <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" -->
@@ -6924,16 +7086,17 @@
          <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='inherited']/j:map/j:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/by-component/inherited/link/text" -->
@@ -6953,16 +7116,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='inherited']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/by-component/inherited/responsible-role/link/text" -->
@@ -6982,12 +7146,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='inherited']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -7013,7 +7178,7 @@
          <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:[@key='description']"
+   <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="system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/description" -->
@@ -7034,16 +7199,17 @@
          <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:[@key='description']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/link/text" -->
@@ -7063,16 +7229,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/responsible-role/link/text" -->
@@ -7092,16 +7259,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/control-implementation/implemented-requirement/by-component/responsible-role/link/text" -->
@@ -7121,12 +7289,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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='responsible-roles']/j:map/j:array[@key='links']/j:map/j:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -7154,7 +7323,7 @@
          <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:[@key='title']"
+   <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" -->
@@ -7174,16 +7343,17 @@
          <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:[@key='title']"
+   <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>
+      <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:[@key='description']"
+   <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="system-security-plan/back-matter/resource/description" -->
@@ -7204,12 +7374,13 @@
          <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:[@key='description']"
+   <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>
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -7222,7 +7393,7 @@
              collapsible="no"
              as-type="string"
              name="document-id"
-             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/oscal-content/oscal/src/metaschema/oscal_metadata_metaschema.xml"
+             _base-uri="file:/mnt/c/Users/davidwal/git/github/david-waltermire-nist/OSCAL/src/metaschema/oscal_metadata_metaschema.xml"
              _key-name="oscal-metadata:document-id"
              _step="document-id"
              _key="document-ids"
@@ -7264,7 +7435,7 @@
          <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:[@key='text']"
+   <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" -->
@@ -7284,16 +7455,17 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <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:[@key='text']"
+   <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="system-security-plan/back-matter/resource/citation/link/text" -->
@@ -7313,12 +7485,13 @@
          <xsl:if test="$with-key">
             <xsl:attribute 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:[@key='text']"
+   <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>
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
@@ -7408,11 +7581,11 @@
       <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"/>
diff --git a/xml/schema/oscal_assessment-plan_schema.xsd b/xml/schema/oscal_assessment-plan_schema.xsd
index eb2301ca60..eb027e0d62 100644
--- a/xml/schema/oscal_assessment-plan_schema.xsd
+++ b/xml/schema/oscal_assessment-plan_schema.xsd
@@ -2652,30 +2652,53 @@
                      minOccurs="0"
                      maxOccurs="unbounded"/>
          <xs:element name="status" minOccurs="1" maxOccurs="1">
-            <xs:simpleType>
+            <xs:complexType>
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Objective Status</m:formal-name>
-                     <m:description>A brief indication as to whether the objective is satisfied or not within a given system.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Objective Status</b>: A brief indication as to whether the objective is satisfied or not within a given system.</xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="oscal-ap:token"/>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="reason" minOccurs="0" maxOccurs="unbounded">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Objective Status Reason</m:formal-name>
-                     <m:description>The reason the objective was given it's status.</m:description>
+                     <m:description>A determination of if the objective is satisfied or not within a given system.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Objective Status Reason</b>: The reason the objective was given it's status.</xs:documentation>
+                     <b>Objective Status</b>: A determination of if the objective is satisfied or not within a given system.</xs:documentation>
                </xs:annotation>
-               <xs:restriction base="xs:NCName"/>
-            </xs:simpleType>
+               <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>
+                        </xs:appinfo>
+                        <xs:documentation>
+                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                     </xs:annotation>
+                     <xs:complexType>
+                        <xs:group ref="oscal-ap:blockElementGroup"
+                                  maxOccurs="unbounded"
+                                  minOccurs="0"/>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
+               <xs:attribute name="state" use="required" type="oscal-ap:token">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Objective Status State</m:formal-name>
+                        <m:description>An indication as to whether the objective is satisfied or not.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Objective Status State</b>: An indication as to whether the objective is satisfied or not.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+               <xs:attribute name="reason" type="oscal-ap:token">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Objective Status Reason</m:formal-name>
+                        <m:description>The reason the objective was given it's status.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Objective Status Reason</b>: The reason the objective was given it's status.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+            </xs:complexType>
          </xs:element>
          <xs:element name="implementation-status"
                      type="oscal-ap:oscal-implementation-common-implementation-status-ASSEMBLY"
diff --git a/xml/schema/oscal_assessment-results_schema.xsd b/xml/schema/oscal_assessment-results_schema.xsd
index 5ebb43d7ea..2acdaf8758 100644
--- a/xml/schema/oscal_assessment-results_schema.xsd
+++ b/xml/schema/oscal_assessment-results_schema.xsd
@@ -3085,30 +3085,53 @@
                      minOccurs="0"
                      maxOccurs="unbounded"/>
          <xs:element name="status" minOccurs="1" maxOccurs="1">
-            <xs:simpleType>
+            <xs:complexType>
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Objective Status</m:formal-name>
-                     <m:description>A brief indication as to whether the objective is satisfied or not within a given system.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Objective Status</b>: A brief indication as to whether the objective is satisfied or not within a given system.</xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="oscal-ar:token"/>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="reason" minOccurs="0" maxOccurs="unbounded">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Objective Status Reason</m:formal-name>
-                     <m:description>The reason the objective was given it's status.</m:description>
+                     <m:description>A determination of if the objective is satisfied or not within a given system.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Objective Status Reason</b>: The reason the objective was given it's status.</xs:documentation>
+                     <b>Objective Status</b>: A determination of if the objective is satisfied or not within a given system.</xs:documentation>
                </xs:annotation>
-               <xs:restriction base="xs:NCName"/>
-            </xs:simpleType>
+               <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>
+                        </xs:appinfo>
+                        <xs:documentation>
+                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                     </xs:annotation>
+                     <xs:complexType>
+                        <xs:group ref="oscal-ar:blockElementGroup"
+                                  maxOccurs="unbounded"
+                                  minOccurs="0"/>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
+               <xs:attribute name="state" use="required" type="oscal-ar:token">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Objective Status State</m:formal-name>
+                        <m:description>An indication as to whether the objective is satisfied or not.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Objective Status State</b>: An indication as to whether the objective is satisfied or not.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+               <xs:attribute name="reason" type="oscal-ar:token">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Objective Status Reason</m:formal-name>
+                        <m:description>The reason the objective was given it's status.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Objective Status Reason</b>: The reason the objective was given it's status.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+            </xs:complexType>
          </xs:element>
          <xs:element name="implementation-status"
                      type="oscal-ar:oscal-implementation-common-implementation-status-ASSEMBLY"
diff --git a/xml/schema/oscal_complete_schema.xsd b/xml/schema/oscal_complete_schema.xsd
index 1cc7196a25..b26ee89510 100644
--- a/xml/schema/oscal_complete_schema.xsd
+++ b/xml/schema/oscal_complete_schema.xsd
@@ -6447,30 +6447,53 @@
                      minOccurs="0"
                      maxOccurs="unbounded"/>
          <xs:element name="status" minOccurs="1" maxOccurs="1">
-            <xs:simpleType>
+            <xs:complexType>
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Objective Status</m:formal-name>
-                     <m:description>A brief indication as to whether the objective is satisfied or not within a given system.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Objective Status</b>: A brief indication as to whether the objective is satisfied or not within a given system.</xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="oscal-complete:token"/>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="reason" minOccurs="0" maxOccurs="unbounded">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Objective Status Reason</m:formal-name>
-                     <m:description>The reason the objective was given it's status.</m:description>
+                     <m:description>A determination of if the objective is satisfied or not within a given system.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Objective Status Reason</b>: The reason the objective was given it's status.</xs:documentation>
+                     <b>Objective Status</b>: A determination of if the objective is satisfied or not within a given system.</xs:documentation>
                </xs:annotation>
-               <xs:restriction base="xs:NCName"/>
-            </xs:simpleType>
+               <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>
+                        </xs:appinfo>
+                        <xs:documentation>
+                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                     </xs:annotation>
+                     <xs:complexType>
+                        <xs:group ref="oscal-complete:blockElementGroup"
+                                  maxOccurs="unbounded"
+                                  minOccurs="0"/>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
+               <xs:attribute name="state" use="required" type="oscal-complete:token">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Objective Status State</m:formal-name>
+                        <m:description>An indication as to whether the objective is satisfied or not.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Objective Status State</b>: An indication as to whether the objective is satisfied or not.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+               <xs:attribute name="reason" type="oscal-complete:token">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Objective Status Reason</m:formal-name>
+                        <m:description>The reason the objective was given it's status.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Objective Status Reason</b>: The reason the objective was given it's status.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+            </xs:complexType>
          </xs:element>
          <xs:element name="implementation-status"
                      type="oscal-complete:oscal-implementation-common-implementation-status-ASSEMBLY"
diff --git a/xml/schema/oscal_poam_schema.xsd b/xml/schema/oscal_poam_schema.xsd
index 2fdc178171..e16a7bd4d7 100644
--- a/xml/schema/oscal_poam_schema.xsd
+++ b/xml/schema/oscal_poam_schema.xsd
@@ -3707,30 +3707,53 @@
                      minOccurs="0"
                      maxOccurs="unbounded"/>
          <xs:element name="status" minOccurs="1" maxOccurs="1">
-            <xs:simpleType>
+            <xs:complexType>
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Objective Status</m:formal-name>
-                     <m:description>A brief indication as to whether the objective is satisfied or not within a given system.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Objective Status</b>: A brief indication as to whether the objective is satisfied or not within a given system.</xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="oscal-poam:token"/>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="reason" minOccurs="0" maxOccurs="unbounded">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Objective Status Reason</m:formal-name>
-                     <m:description>The reason the objective was given it's status.</m:description>
+                     <m:description>A determination of if the objective is satisfied or not within a given system.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Objective Status Reason</b>: The reason the objective was given it's status.</xs:documentation>
+                     <b>Objective Status</b>: A determination of if the objective is satisfied or not within a given system.</xs:documentation>
                </xs:annotation>
-               <xs:restriction base="xs:NCName"/>
-            </xs:simpleType>
+               <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>
+                        </xs:appinfo>
+                        <xs:documentation>
+                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                     </xs:annotation>
+                     <xs:complexType>
+                        <xs:group ref="oscal-poam:blockElementGroup"
+                                  maxOccurs="unbounded"
+                                  minOccurs="0"/>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
+               <xs:attribute name="state" use="required" type="oscal-poam:token">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Objective Status State</m:formal-name>
+                        <m:description>An indication as to whether the objective is satisfied or not.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Objective Status State</b>: An indication as to whether the objective is satisfied or not.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+               <xs:attribute name="reason" type="oscal-poam:token">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Objective Status Reason</m:formal-name>
+                        <m:description>The reason the objective was given it's status.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Objective Status Reason</b>: The reason the objective was given it's status.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+            </xs:complexType>
          </xs:element>
          <xs:element name="implementation-status"
                      type="oscal-poam:oscal-implementation-common-implementation-status-ASSEMBLY"